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

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

@@ -38,12 +38,13 @@ public class ChangeOrderController {
     @ApiOperation("修改预约时间")
     public ResponseHelper changeAppointmentTime(
             @ApiParam(value = "工单号" , required = true) @RequestParam(required = true) String id,
+            @ApiParam(value = "预约" , required = true) @RequestParam(required = true) String type,
             @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 remark,
             HttpServletRequest request
     ) throws ParseException {
-        changeOrderLogic.changeAppointmentTime(id,appointmentTime,appointmentEndTime,remark);
+        changeOrderLogic.changeAppointmentTime(id,appointmentTime,appointmentEndTime,remark,type);
         return ResponseHelper.success();
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/workorder/OrderOperatorLogTypeEnum.java

@@ -18,6 +18,7 @@ public enum OrderOperatorLogTypeEnum implements BaseEnum {
     WORKER("指派师傅","指派师傅"),
     GP("派工","派工"),
     YUYUE("用户预约","用户预约"),
+    YUYUEB("预约","预约"),
     GAIYUE("改约","改约"),
     YCFK("异常反馈","异常反馈"),
     WGFK("完工反馈","完工反馈"),

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

@@ -126,7 +126,12 @@ public class ChangeOrderLogic {
     private final OrderOldProductItemService orderOldProductItemService;
 
     @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 type) {
+        if (type.equals(OrderOperatorLogTypeEnum.YUYUEB.getRemark())){
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
+            if (pgOrderBase.getAppointmentTime() != null)
+                throw new RemoteServiceException("已操作预约无需操作");
+        }
         pgOrderBaseService.lambdaUpdate()
                 .eq(PgOrderBase::getId,id)
                 .set(PgOrderBase::getAppointmentTime,appointmentTime)
@@ -135,16 +140,22 @@ public class ChangeOrderLogic {
                 .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())
                 .update();
 
-        this.addLog(id,remark);
+        this.addLog(id,remark,type);
     }
 
-    private void addLog(String id,String remark) {
+    private void addLog(String id,String remark,String type) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
         pgOrderOperatorLog.setOrderBaseId(id);
-        pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
-        pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
+        if (type.equals(OrderOperatorLogTypeEnum.YUYUEB.getRemark())){
+            pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.YUYUEB.getRemark());
+            pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.YUYUEB.getRemark());
+        }else {
+            pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
+            pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
+        }
+
         pgOrderOperatorLog.setAppointmentTime(pgOrderBase.getAppointmentTime());
         pgOrderOperatorLog.setAppointmentEndTime(pgOrderBase.getAppointmentEndTime());
         pgOrderOperatorLog.setContent(remark);

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

@@ -94,45 +94,71 @@ public class OrderLogLogic {
                 index ++ ;
             }
 
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             context =context+"；申请时间："+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"；反馈内容："+pgOrderOperatorLog.getContent()
                     +",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1;
 
             pgOrderOperatorLog.setContent(context);
 
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
+
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.LAXIU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
         }
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.NOCALL.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YANWU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
         }
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.ZHILIANG.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -140,9 +166,25 @@ public class OrderLogLogic {
 
         //预约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YUYUE.getRemark())){
-            if(pgOrderBase.getAppointmentTime() != null){
-                throw new RemoteServiceException("已预约工单请操作改约");
+
+            if(pgOrderOperatorLog.getAppointmentTime().getTime() < new Date().getTime()){
+                throw new RemoteServiceException("预约时间不可小于当前时间");
             }
+
+            int hour = Integer.parseInt(sdf2.format(pgOrderOperatorLog.getAppointmentTime()));
+            String s = hour >= 12 ? "下午" : "上午";
+            String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
+
+            String format = sdf3.format(pgOrderBase.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
+
+        }
+
+        //预约
+        if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YUYUEB.getRemark())){
+
             if(pgOrderOperatorLog.getAppointmentTime().getTime() < new Date().getTime()){
                 throw new RemoteServiceException("预约时间不可小于当前时间");
             }
@@ -174,13 +216,13 @@ public class OrderLogLogic {
             String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
+            pgOrderOperatorLog.setContent(text+"改约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
         }
         //异常
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YCFK.getRemark())){
             orderFlagLogic.saveOrderFlag(Lists.newArrayList(pgOrderBase.getId()), OrderFlagEnum.YI_CHANGE);
 
-            pgOrderOperatorLog.setContent("异常类型："+pgOrderOperatorLog.getExType()+",异常原因"+pgOrderOperatorLog.getExNote()+",反馈内容："+pgOrderOperatorLog.getContent());
+            pgOrderOperatorLog.setContent("异常类型："+pgOrderOperatorLog.getExType()+",异常原因："+pgOrderOperatorLog.getExNote()+",反馈内容："+pgOrderOperatorLog.getContent());
 
         }
         pgOrderOperatorLog.setCreateWebsit(pgOrderBase.getWebsitName());

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

@@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.material.StateEnum;
 import com.gree.mall.manager.plus.entity.Abnormal;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
+@ApiModel
 public class AbnormalVO  {
 
 
@@ -26,7 +29,7 @@ public class AbnormalVO  {
     private String exNote;
 
     @ApiModelProperty(value = "状态")
-    private String status;
+    private StateEnum status;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -320,10 +320,10 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请稍后再试");
+            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {
-            throw new RemoteServiceException("扫码支付失败,请稍后再试");
+            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
         }
         //记录流水
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(companyWechatId);
@@ -1234,10 +1234,10 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请稍后再试");
+            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {
-            throw new RemoteServiceException("扫码支付失败,请稍后再试");
+            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
         }
         //记录流水
 

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

@@ -6,6 +6,7 @@ import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.workorder.AbnormalVO;
 import com.gree.mall.manager.bean.workorder.IncreVO;
 import com.gree.mall.manager.commonmapper.workorder.IncreMapper;
+import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.Abnormal;
 import com.gree.mall.manager.plus.service.AbnormalService;
@@ -39,7 +40,7 @@ public class AbnormalLogic {
 
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         //1.组装查询条件
-        zfireParam = FieldUtils.supplyParam(zfireParam, IncreVO.class);
+        zfireParam = FieldUtils.supplyParam(zfireParam, AbnormalVO.class);
 
         IPage<AbnormalVO> abnormalVOIPage = increMapper.listAbnormal(page, zfireParam,adminCompanyIds);
         return abnormalVOIPage;
@@ -51,12 +52,27 @@ public class AbnormalLogic {
 
     public void add(Abnormal abnormal) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        if (abnormalService.lambdaQuery().eq(Abnormal::getExType,abnormal.getExType())
+                .eq(Abnormal::getCompanyWechatId,adminUser.getCompanyWechatId())
+                .eq(Abnormal::getExNote,abnormal.getExNote()).count() > 0) {
+            throw new RemoteServiceException("存在相同原因");
+        }
+
         abnormal.setCompanyWechatId(adminUser.getCompanyWechatId());
         abnormal.setCompanyWechatName(adminUser.getCompanyName());
         abnormal.insert();
     }
 
     public void update(Abnormal abnormal) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (abnormalService.lambdaQuery().eq(Abnormal::getExType,abnormal.getExType())
+                .eq(Abnormal::getCompanyWechatId,adminUser.getCompanyWechatId())
+                .eq(Abnormal::getExNote,abnormal.getExNote())
+                .ne(Abnormal::getId,abnormal.getId())
+                .count() > 0) {
+            throw new RemoteServiceException("存在相同原因");
+        }
         abnormal.updateById();
     }
 }

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

@@ -118,8 +118,15 @@ public class OrderLogLogic {
                 index ++ ;
             }
 
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
+
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             context =context+"；申请时间："+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"；反馈内容："+pgOrderOperatorLog.getContent()
                     +",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1;
@@ -129,34 +136,56 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.LAXIU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
+
         }
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.NOCALL.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
+
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YANWU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
+
+            pgOrderBaseService.lambdaUpdate()
+                    .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
+                    .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
+                    .update();
+
         }
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.ZHILIANG.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -200,7 +229,7 @@ public class OrderLogLogic {
             String s = hour >= 12 ? "下午" : "上午";
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
+            pgOrderOperatorLog.setContent(text+"改约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
         }
         //已完工
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.WGFK.getKey())){
@@ -247,7 +276,7 @@ public class OrderLogLogic {
             }
             orderFlagLogic.saveOrderFlag(Lists.newArrayList(pgOrderBase.getId()),OrderFlagEnum.YI_CHANGE);
 
-            pgOrderOperatorLog.setContent("异常类型："+pgOrderOperatorLog.getExType()+",异常原因"+pgOrderOperatorLog.getExNote()+",反馈内容："+pgOrderOperatorLog.getContent());
+            pgOrderOperatorLog.setContent("异常类型："+pgOrderOperatorLog.getExType()+",异常原因："+pgOrderOperatorLog.getExNote()+",反馈内容："+pgOrderOperatorLog.getContent());
 
         }