Requirement(update)

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -174,6 +174,9 @@ public class RequirementsInfoDO implements Serializable {
     @ApiModelProperty(value = "抢单飞手id")
     private Integer pilotCertificationId;
 
+    @ApiModelProperty(value = "发布者openid")
+    private String openid;
+
     public RequirementsInfoVO buildRequirementsInfoVO() {
         return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
                 .publishPhone(this.publishPhone).requireDescription(this.requireDescription).solved(this.solved).taskStartTime(this.taskStartTime).taskEndTime(this.taskEndTime)

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -1302,6 +1302,10 @@ public class RequirementsServiceImpl implements RequirementsService {
              walletFlowVO.setFlyerWalletFlowVO(flyerWalletFlowVO);
 
             flyerCancel(walletFlowVO,request.getHeader("token"));
+
+            //给发布者或者飞手发送信息
+            this.publicSendMsgPublishInfoAuth(requirementsServiceDO);
+            this.requirementsInfoInfoAuth(requirementsInfoDO);
             return ResultBody.success();
 
             }
@@ -1319,6 +1323,108 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success();
     }
 
+
+    /**
+     * 给发布者发信息
+     */
+    private void requirementsInfoInfoAuth(RequirementsInfoDO requirementsInfoDO) {
+
+        //订单编号
+
+        JSONObject value1 = new JSONObject();
+        value1.put("value", requirementsInfoDO.getPublisherNumber());
+
+        //订单金额
+        JSONObject value2 = new JSONObject();
+        value2.put("value", requirementsInfoDO.getOrderAmount());
+
+        //下单时间
+        JSONObject value3 = new JSONObject();
+        value3.put("value", requirementsInfoDO.getCreateTime());
+
+        //取消时间
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 设置日期格式
+        String date = df.format(new Date());
+        JSONObject value4 = new JSONObject();
+        value4.put("value", date);
+
+        JSONObject value5 = new JSONObject();
+        String remark = "退回金额" + requirementsInfoDO.getOrderAmount() + "元";
+        value5.put("value", remark);
+
+        JSONObject datad = new JSONObject();
+        //订单编号
+        datad.put("character_string2", value1);
+        //订单金额
+        datad.put("amount3", value2);
+        //下单时间
+        datad.put("date5", value3);
+        //取消时间
+        datad.put("time7", value4);
+        //备注
+        datad.put("thing4", value5);
+
+        AppletMsgVOS appletMsgVO = new AppletMsgVOS();
+        appletMsgVO.setTouser(requirementsInfoDO.getOpenid());
+        appletMsgVO.setTemplate_id(WxMsgTemplete.INDEMNIFY_FOR_PUBLICATION);
+        appletMsgVO.setPage("pages/welcome/index");
+        appletMsgVO.setData(datad);
+        appletMsgVO.setMiniprogram_state(userSystemConstant.getMiniProgramState());
+        appletMsgVO.setLang("zh_CN");
+        sendUserAppletMsg(appletMsgVO);
+    }
+
+    /**
+     * 给飞手短信
+     * @param requirementsServiceDO
+     */
+    private void publicSendMsgPublishInfoAuth(RequirementsServiceDO requirementsServiceDO) {
+
+        //订单编号
+
+        JSONObject value1 = new JSONObject();
+        value1.put("value", requirementsServiceDO.getPublisherNumber());
+
+        //订单金额
+        JSONObject value2 = new JSONObject();
+        value2.put("value", requirementsServiceDO.getPreemptTotalAmount());
+
+        //下单时间
+        JSONObject value3 = new JSONObject();
+        value3.put("value", requirementsServiceDO.getCreateTime());
+
+        //取消时间
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 设置日期格式
+        String date = df.format(new Date());
+        JSONObject value4 = new JSONObject();
+        value4.put("value", date);
+
+        JSONObject value5 = new JSONObject();
+        String remark = "退回金额" + requirementsServiceDO.getPreemptTotalAmount() + "元";
+        value5.put("value", remark);
+
+        JSONObject datad = new JSONObject();
+        //订单编号
+        datad.put("character_string2", value1);
+        //订单金额
+        datad.put("amount3", value2);
+        //下单时间
+        datad.put("date5", value3);
+        //取消时间
+        datad.put("time7", value4);
+        //备注
+        datad.put("thing4", value5);
+
+        AppletMsgVOS appletMsgVO = new AppletMsgVOS();
+        appletMsgVO.setTouser(requirementsServiceDO.getOpenid());
+        appletMsgVO.setTemplate_id(WxMsgTemplete.INDEMNIFY_FOR_PUBLICATION);
+        appletMsgVO.setPage("pages/welcome/index");
+        appletMsgVO.setData(datad);
+        appletMsgVO.setMiniprogram_state(userSystemConstant.getMiniProgramState());
+        appletMsgVO.setLang("zh_CN");
+        sendUserAppletMsg(appletMsgVO);
+    }
+
     /**
      * 修改任务佣金
      *

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -914,7 +914,7 @@
                rs.service_flow_id,
                rs.pilot_certification_user_id,
                ra.order_amount,
-               ri.openid,
+               rs.openid,
                ra.order_earnings
         FROM requirements_info ri
                  LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
@@ -1061,7 +1061,7 @@
                ra.wechat_pay_order_number,
                ri.service_flow_id,
                rs.pilot_certification_user_id,
-               rs.openid    as flyerOpenid,
+               ri.openid,
                ri.create_time,
                ra.order_level_amount,
                ra.order_earnings