Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/ChangeOrderController.java

@@ -42,9 +42,10 @@ public class ChangeOrderController {
             @ApiParam(value = "预约开始时间" , required = true) @RequestParam(required = true) String appointmentTime,
             @ApiParam(value = "预约结束时间" , required = true) @RequestParam(required = true) String appointmentEndTime,
             @ApiParam(value = "备注" , required = false) @RequestParam(required = false) String remark,
+            @ApiParam(value = "附件" , required = false) @RequestParam(required = false) String imgSrc,
             HttpServletRequest request
     ) throws ParseException {
-        changeOrderLogic.changeAppointmentTime(id,appointmentTime,appointmentEndTime,remark,type);
+        changeOrderLogic.changeAppointmentTime(id,appointmentTime,appointmentEndTime,remark,type,imgSrc);
         return ResponseHelper.success();
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/ChangeOrderLogic.java

@@ -126,7 +126,7 @@ public class ChangeOrderLogic {
     private final OrderOldProductItemService orderOldProductItemService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark,String type) {
+    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark,String type,String imgSrc) {
         if (type.equals(OrderOperatorLogTypeEnum.YUYUEB.getRemark())){
             PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
             if (pgOrderBase.getAppointmentTime() != null)
@@ -146,10 +146,10 @@ public class ChangeOrderLogic {
                 .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())
                 .update();
 
-        this.addLog(id,remark,type);
+        this.addLog(id,remark,type,imgSrc);
     }
 
-    private void addLog(String id,String remark,String type) {
+    private void addLog(String id,String remark,String type,String imgSrc) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
@@ -165,6 +165,7 @@ public class ChangeOrderLogic {
         pgOrderOperatorLog.setAppointmentTime(pgOrderBase.getAppointmentTime());
         pgOrderOperatorLog.setAppointmentEndTime(pgOrderBase.getAppointmentEndTime());
         pgOrderOperatorLog.setContent(remark);
+        pgOrderOperatorLog.setImgSrc(imgSrc);
         orderLogLogic.addLog(pgOrderOperatorLog);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/ChangeAppointmentVO.java

@@ -24,6 +24,10 @@ public class ChangeAppointmentVO {
     @ApiModelProperty(value = "补充备注")
     private String remark;
 
+    @ApiModelProperty(value = "附件")
+    private String imgSrc;
+
+
 
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/ChangeOrderController.java

@@ -47,7 +47,8 @@ public class ChangeOrderController {
             HttpServletRequest request
     ) throws ParseException {
         for (String s : changeAppointmentVO.getIds()) {
-            changeOrderLogic.changeAppointmentTime(s,changeAppointmentVO.getAppointmentTime(),changeAppointmentVO.getAppointmentEndTime(),changeAppointmentVO.getRemark());
+            changeOrderLogic.changeAppointmentTime(s,changeAppointmentVO.getAppointmentTime(),changeAppointmentVO.getAppointmentEndTime()
+                    ,changeAppointmentVO.getRemark(),changeAppointmentVO.getImgSrc());
         }
 
         return ResponseHelper.success();

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -108,7 +108,7 @@ public class ChangeOrderLogic {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark) {
+    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark,String imgSrc) {
         pgOrderBaseService.lambdaUpdate()
                 .eq(PgOrderBase::getId,id)
                 .set(!StringUtils.isEmpty(remark),PgOrderBase::getChangeRemark,remark)
@@ -122,10 +122,10 @@ public class ChangeOrderLogic {
 //                .eq(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DYY.getKey())
 //                .set(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DSHPG).update();
 
-        this.addLog(id);
+        this.addLog(id,imgSrc);
     }
 
-    private void addLog(String id) {
+    private void addLog(String id,String imgSrc) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
@@ -135,6 +135,7 @@ public class ChangeOrderLogic {
         pgOrderOperatorLog.setAppointmentTime(pgOrderBase.getAppointmentTime());
         pgOrderOperatorLog.setAppointmentEndTime(pgOrderBase.getAppointmentEndTime());
         pgOrderOperatorLog.setContent(pgOrderBase.getChangeRemark());
+        pgOrderOperatorLog.setImgSrc(imgSrc);
         orderLogLogic.addLog(pgOrderOperatorLog);
     }