RequirementsVo(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/GrabTheOrderVO.java

@@ -48,5 +48,8 @@ public class GrabTheOrderVO {
     @ApiModelProperty(value = "支付方式，云享金：1，佣金：2，微信支付：3", example = "1,2,3")
     private String paymentType;
 
+    @ApiModelProperty(value = "手机号", hidden = true)
+    private String phoneNum;
+
 
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java

@@ -33,7 +33,7 @@ public class ServiceRequirementsVO implements Serializable {
     private Integer id;
 
     @ApiModelProperty(value = "id", example = "1")
-    @NotBlank(message = "服务类型名称不能为空", groups = {Insert.class, Update.class})
+    @NotNull(message = "服务类型名称不能为空", groups = {Insert.class, Update.class})
     private Integer serviceId;
 
     @ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true)

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -77,8 +77,12 @@ public class RequirementsController extends BaseController {
     @NotRepeatSubmit(value = 3000L)
     @PostMapping("grabTheOrder")
     public ResultBody grabTheOrder(@RequestBody GrabTheOrderVO grabTheOrderVO, HttpServletRequest request) {
+
+        String phoneNum = this.getUserLoginInfoFromRedis(request).getPhoneNum();
+
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         grabTheOrderVO.setUserAccountId(userAccountId);
+        grabTheOrderVO.setPhoneNum(phoneNum);
         return requirementsService.grabTheOrder(grabTheOrderVO, request);
     }
 
@@ -336,6 +340,6 @@ public class RequirementsController extends BaseController {
     public ResultBody deleteRequire(@RequestParam Integer requirementsInfoId, HttpServletRequest request) {
         return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
-    
+
 
 }

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

@@ -75,6 +75,8 @@ public class RequirementsServiceDO implements Serializable {
     private BigDecimal orderAmount;
     @ApiModelProperty(value = "抢单者openid")
     private String openid;
+    @ApiModelProperty(value = "手机号", hidden = true)
+    private String phoneNum;
 
     public RequirementsServiceDO(PilotCertificationInteriorDTO pilot, ServiceRequirementsDO requirementsInfoDO) {
         this.pilotCertificationId = pilot.getId();
@@ -82,5 +84,5 @@ public class RequirementsServiceDO implements Serializable {
         this.requirementsInfoId = requirementsInfoDO.getId();
     }
 
-   
+
 }

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

@@ -137,6 +137,9 @@ public class ServiceRequirementsDO {
     @ApiModelProperty(value = "openid")
     private String openid;
 
+    @ApiModelProperty(value = "服务名称")
+    private String serviceName;
+
 
     public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
         this.id = serviceRequirementsVO.getId();

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

@@ -1341,7 +1341,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         //订单重新添加
         // RequirementsInfoDO infoDO = new RequirementsInfoDO(requirementsEditVO);
         BigDecimal tempTotalAmount = new BigDecimal(0);
-        String json = stringRedisTemplate.opsForValue().get(requirementsInfoDO.getWechatPayOrderNumber() + requirementsInfoDO.getUserAccountId());
+        String json = stringRedisTemplate.opsForValue().get(requirementsEditVO.getWechatPayOrderNumber() + requirementsEditVO.getUserAccountId());
         GetOrderNumberDTO getOrderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
         if (getOrderNumberDTO == null) {
             return ResultBody.error("订单支付失败");
@@ -1386,6 +1386,8 @@ public class RequirementsServiceImpl implements RequirementsService {
         }
         if (tempTotalAmount.compareTo(BigDecimal.ZERO) == 0) {
             requirementsDao.InsertRequirementsAmountLog(requirementsInfoDO);
+            IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsEditVO.getServiceId());
+            infoDO.setServiceName(industryTypeDTO.getTypeName());
             requirementsDao.updateRequirementsInfo(infoDO);
             BigDecimal add = amountDO.getOrderAmount().add(requirementsInfoDO.getOrderLevelAmount());
             amountDO.setTotalAmount(add);
@@ -1809,6 +1811,8 @@ public class RequirementsServiceImpl implements RequirementsService {
                     }
                 }
             }
+            IndustryTypeDTO industryTypeDTO = getIndustryTypeById(requirementsInfoDO.getServiceId());
+            requirementsInfoDO.setServiceName(industryTypeDTO.getTypeName());
             requirementsInfoDO.setOpenid(openid);
             requirementsDao.addPublishService(requirementsInfoDO);
             RequirementsAmountDO requirementsAmountDO = new RequirementsAmountDO(requirementsInfoDO);
@@ -1986,6 +1990,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             BigDecimal add1 = add.add(weChat);
             requirementsServiceDO.setPreemptTotalAmount(add1);
             requirementsServiceDO.setOpenid(openid);
+            requirementsServiceDO.setPhoneNum(grabTheOrderVO.getPhoneNum());
             requirementsDao.insertService(requirementsServiceDO);
             requirementsInfoDO.setRepertory(repertory - 1);
             requirementsDao.updateGrabTheOrder(grabTheOrderVO.getRequirementsInfoId(), requirementsInfoDO.getRepertory());

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

@@ -122,6 +122,12 @@
             <if test=" adcode != null  and adcode != ' ' ">
                 adcode = #{adcode},
             </if>
+            <if test=" serviceId != null   ">
+                service_id = #{serviceId},
+            </if>
+            <if test=" serviceName != null  and  serviceName!='' ">
+                service_name = #{serviceName},
+            </if>
             update_time=NOW(),
             service_flow_id=1
         </set>
@@ -401,11 +407,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
-                #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid});
+                #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
+                #{serviceName});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"
@@ -464,10 +471,10 @@
                                          pilot_certification_user_id, team_id, team_user_id, cash_amount, we_chat,
                                          salary_amount,
                                          wechat_pay_order_number, service_flow_id, preempt_total_amount, openid,
-                                         create_time, update_time)
+                                         create_time, update_time, preempt_phone)
         VALUES (#{requirementsInfoId}, #{pilotCertificationId}, #{pilotCertificationUserId},
                 #{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber}, 2,
-                #{preemptTotalAmount}, #{openid}, NOW(), NOW());
+                #{preemptTotalAmount}, #{openid}, NOW(), NOW(), #{phoneNum});
     </insert>
 
     <insert id="arriveAtTheScene" parameterType="com.mmc.csf.release.entity.requirements.ServiceArriveSceneDO"