BackRequirementsDao.xml(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java

@@ -62,4 +62,7 @@ public class ServiceOrderFormDTO {
 
     @ApiModelProperty(value = "状态", example = "100")
     private String orderStatus;
+
+    @ApiModelProperty(value = "等待状态", example = "等待状态")
+    private String waiting;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/industry/UserPayInfoVO.java

+package com.mmc.csf.release.industry;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/8/31 14:18
+ * @Version 1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserPayInfoVO {
+    @ApiModelProperty("订单号")
+    private String outTradeNo;
+    @ApiModelProperty("支付成功时间")
+    private String successTime;
+    @ApiModelProperty("用户支付金额")
+    private Integer wxNotifyPayerTotal;
+    @ApiModelProperty("交易状态")
+    private String tradeState;
+    @ApiModelProperty("用户id")
+    private Integer userAccountId;
+}

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

@@ -66,6 +66,9 @@ public class ServiceOrderFormDO {
     @ApiModelProperty(value = "状态", example = "100")
     private String orderStatus;
 
+    @ApiModelProperty(value = "等待状态", example = "100")
+    private String waiting;
+
     public ServiceOrderFormDTO buildServiceOrderForm() {
         return ServiceOrderFormDTO.builder()
                 .id(this.id)
@@ -81,6 +84,7 @@ public class ServiceOrderFormDO {
                 .createTime(this.createTime)
                 .updateTime(this.updateTime)
                 .orderStatus(this.orderStatus)
+                .waiting(this.waiting)
                 .build();
     }
 

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

@@ -20,6 +20,7 @@ import com.mmc.csf.release.entity.requirements.*;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.industry.IndustryTypeDTO;
+import com.mmc.csf.release.industry.UserPayInfoVO;
 import com.mmc.csf.release.service.RequirementsService;
 import com.mmc.csf.release.util.RestTemplateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -601,6 +602,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             //表示订单计算完成，需要支付的钱都算出来了
             System.out.println(requirementsServiceDO.getWechatPayOrderNumber());
             orderNumberDTO.setWeChatPay(requirementsServiceDO.getWeChat());
+            IsNullConvertZeroUtil.checkIsNull(orderNumberDTO);
             if (orderNumberDTO.getWeChatPay().compareTo(BigDecimal.ZERO) != 0) {
                 orderNumberDTO.setWeChatPay(requirementsServiceDO.getWeChat());
                 orderNumberDTO.setPaymentOrderNumber(randomOrderCode());
@@ -2028,6 +2030,8 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsServiceDO.setPreemptTotalAmount(add1);
             requirementsServiceDO.setOpenid(openid);
             requirementsServiceDO.setPhoneNum(grabTheOrderVO.getPhoneNum());
+            //微信是否支付成功
+
             requirementsDao.insertService(requirementsServiceDO);
             requirementsInfoDO.setRepertory(repertory - 1);
             requirementsDao.updateGrabTheOrder(grabTheOrderVO.getRequirementsInfoId(), requirementsInfoDO.getRepertory());
@@ -2339,6 +2343,22 @@ public class RequirementsServiceImpl implements RequirementsService {
         return list;
     }
 
+    /*    String token = request.getHeader("token");
+        HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(userAccountId), headers);
+        ResponseEntity<PilotCertificationInteriorDTO> exchange1 = restTemplate.exchange(userApp + "/userapp/pilot/interiorDetailPilot?userAccountId=" + userAccountId, HttpMethod.GET, entity, PilotCertificationInteriorDTO.class);
+        PilotCertificationInteriorDTO body = exchange1.getBody();*/
+    public UserPayInfoVO queryUserPayInfo(String orderNo) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+        ResponseEntity<UserPayInfoVO> exchange = restTemplate.exchange(paymentApp + "/payment/wechat/queryUserPayInfo?orderNo=" + orderNo, HttpMethod.GET, entity, UserPayInfoVO.class);
+        UserPayInfoVO body = exchange.getBody();
+        return body;
+    }
+
 
     public IndustryTypeDTO getIndustryTypeById(Integer serviceId) {
         HttpHeaders headers = new HttpHeaders();

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

@@ -65,7 +65,8 @@
         sf.doing,
         ri.service_id,
         ri.service_name,
-        sf.order_status
+        sf.order_status,
+        sf.waiting
         FROM
         requirements_info ri
         LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id