impl(update)

release-service/src/main/java/com/mmc/csf/release/commit/NotRepeatSubmitConfig.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.vo.GrabTheOrderVO;
 import com.mmc.csf.release.controller.BaseController;
+import com.mmc.csf.release.dao.RequirementsDao;
 import com.mmc.csf.release.industry.UserPayInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -49,6 +50,9 @@ public class NotRepeatSubmitConfig extends BaseController {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private RequirementsDao requirementsDao;
+
 
     @Pointcut("@within(notRepeatSubmit)||@annotation(notRepeatSubmit)")
     public void pointcut(NotRepeatSubmit notRepeatSubmit) {
@@ -66,6 +70,7 @@ public class NotRepeatSubmitConfig extends BaseController {
         HttpServletRequest request = attributes.getRequest();
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         String accountUriLockKey = userAccountId + "-" + request.getServletPath();
+
         // 设置锁定资源名称，accountUriLock改为userid+uri作为标识，作为测试写死
         //   String accountUriLockKey = "accountUriLock";
 
@@ -95,9 +100,15 @@ public class NotRepeatSubmitConfig extends BaseController {
             try {
                 String wechatPayOrderNumber = grabTheOrderVO.getWechatPayOrderNumber();
                 Integer requirementsInfoId = grabTheOrderVO.getRequirementsInfoId();
-               /* if (wechatPayOrderNumber != null) {
-                    queryUserPayInfo()
-                }*/
+                if (wechatPayOrderNumber != null) {
+                    UserPayInfoVO userPayInfoVO = queryUserPayInfo(wechatPayOrderNumber, request);
+                    System.out.println(userPayInfoVO);
+                    if (userPayInfoVO.getTradeState() != "SUCCESS") {
+                        ResultBody delete = getDelete(requirementsInfoId, request);
+                        requirementsDao.updateRepertory(requirementsInfoId);
+                    }
+
+                }
 
                 // 查询订单库存判断是否大于0
                 //                大于0表示还有库存可以更新订单库存将库存数字减一更新到数据库中
@@ -147,9 +158,10 @@ public class NotRepeatSubmitConfig extends BaseController {
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.add("token", token);
         HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(requirementsInfoId), headers);
-        ResponseEntity<ResultBody> exchange = restTemplate.exchange(omsApp + "releaseOrder/getDelete?requirementsInfoId=" + requirementsInfoId, HttpMethod.GET, entity, ResultBody.class);
+        ResponseEntity<ResultBody> exchange = restTemplate.exchange(omsApp + "releaseOrder/getDeleteOrder?requirementsInfoId=" + requirementsInfoId, HttpMethod.GET, entity, ResultBody.class);
         //UserPayInfoVO body = exchange.getBody();
         ResultBody body = exchange.getBody();
+        //    ResultBody<Object> objectResultBody = new ResultBody<>();
         return body;
     }
 

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -189,4 +189,6 @@ public interface RequirementsDao {
     void updatePlatformorderAmount(BigDecimal bigDecimal2, Integer id);
 
     RequirementsServiceDO serviceReq(Integer requirementsInfoId);
+
+    void updateRepertory(Integer requirementsInfoId);
 }

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

@@ -797,6 +797,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         BigDecimal orderEarnings = requirementsServiceDO.getOrderEarnings();
         BigDecimal add = orderEarnings.add(earnings);
         requirementsServiceDO.setOrderEarnings(add);
+        requirementsServiceDO.setRequirementsInfoId(requirementsServiceDO.getId());
         requirementsDao.updateAmounts(requirementsServiceDO);
         //  requirementsDao.insertPlatformOrderEarnings(earnings, requirementsInfoId, userAccountId);
         requirementsDao.updatePlatformOrderEarnings(earnings, requirementsInfoId, userAccountId);

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

@@ -1279,4 +1279,9 @@
         from requirements_service
         where requirements_info_id = #{requirementsInfoId}
     </select>
+    <update id="updateRepertory">
+        update requirements_info
+        set repertory=1
+        where id = #{requirementsInfoId}
+    </update>
 </mapper>