update

src/main/java/com/gogirl/application/market/impl/MarketServiceImpl.java

@@ -491,7 +491,7 @@ public class MarketServiceImpl implements MarketService {
                         //打折订单项总支付金额
                         BigDecimal total = canUserOrderServeList.stream().map(OrderServe::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 
-                        if (total.intValue() != 0) {
+                        if (!total.setScale(2, BigDecimal.ROUND_HALF_UP).equals(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP))) {
                             //卡券的总折扣金额
                             BigDecimal totalCouponDiscount = couponCustomerRelevance.getDiscountAmount();
                             //卡券总支付金额

src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java

@@ -9,13 +9,16 @@ import com.gogirl.assembler.OverTimeLogCommandAssembler;
 import com.gogirl.domain.store.oa.OverTimeRecordLog;
 import com.gogirl.domain.store.oa.OvertimeRecord;
 import com.gogirl.domain.store.oa.TakeLeaveEvent;
+import com.gogirl.domain.store.store.Message;
 import com.gogirl.domain.store.store.StoreManage;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.infrastructure.common.exception.RRException;
+import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.store.oa.OverTimeRecordLogMapper;
 import com.gogirl.infrastructure.mapper.store.oa.OvertimeRecordMapper;
 import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
+import com.gogirl.infrastructure.mapper.store.store.MessageMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.shared.store.command.ApplyTakeLeaveCommand;
@@ -27,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -49,7 +53,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
     private final TakeLeaveEventMapper takeLeaveEventRepository;
     private final OvertimeRecordMapper overtimeRecordRepository;
     private final OverTimeRecordLogMapper overTimeRecordLogRepository;
-
+    private final MessageMapper messageMapper;
 
     @Override
     public void applyTakeLeave(ApplyTakeLeaveCommand cmd) {
@@ -102,6 +106,19 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
             //写入加班使用情况日志
             overTimeRecordLogList.forEach(overTimeRecordLogRepository::insert);
         }
+
+        takeLeaveEvent.setApplyStoreTechnician(storeTechnician);
+        Message message = Message.builder()
+                .content("请假审核通知")
+                .isRead(0)
+                .paramJson(JsonUtilByFsJson.beanToJson(takeLeaveEvent))
+                .technicianId(takeLeaveEvent.getDealingTechnicianId())
+                .time(new Date())
+                .title("请假审核")
+                .type(1)
+                .tab(2)
+                .build();
+        messageMapper.insert(message);
     }
 
     @Transactional
@@ -153,6 +170,22 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
         takeLeaveEvent.setStatus(cmd.getApproval());
         takeLeaveEvent.setRejectReason(cmd.getRejectReason());
         takeLeaveEventRepository.updateById(takeLeaveEvent);
+
+
+        Message message = Message.builder()
+                .content("请假申请通过了")
+                .isRead(0)
+                .paramJson(JsonUtilByFsJson.beanToJson(takeLeaveEvent))
+                .technicianId(takeLeaveEvent.getApplyTechnicianId())
+                .time(new Date())
+                .title("请假申请")
+                .type(3)
+                .tab(2)
+                .build();
+        if (cmd.getApproval().equals(TakeLeaveEvent.STATUS_APPROVAL_REFUSE)) {
+            message.setContent("请假申请被拒绝了");
+        }
+        messageMapper.insert(message);
     }
 
     @Override

src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java

@@ -81,4 +81,6 @@ public class TakeLeaveEvent {
     @TableField(exist = false)
     private String applyTechnicianName;
 
+    @TableField(exist = false)
+    private StoreTechnician applyStoreTechnician;
 }

src/main/java/com/gogirl/domain/store/store/Message.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.gogirl.domain.store.oa.TakeLeaveEvent;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
 @ApiModel("美甲师消息")
 @Data
 @TableName("message")
+@Builder
 public class Message {
 
     @TableId(type = IdType.AUTO)