debug

joying-common/src/main/java/com/fzm/common/service/OrderService.java

@@ -6,6 +6,7 @@ import com.fzm.common.entity.dto.OrderDto;
 import com.fzm.common.entity.vo.OrderVo;
 import com.fzm.common.enums.OrderStatus;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -63,4 +64,12 @@ public interface OrderService extends IService<Order> {
     List<OrderVo> listOrder(Integer payScene);
 
     void processOrder(Long orderId, Integer productId, Integer payScene);
+
+    /**
+     * 更新订单状态
+     *
+     * @param orderId
+     * @return
+     */
+    Boolean renewOrderStatus(Long orderId) throws IOException, InterruptedException;
 }

joying-common/src/main/java/com/fzm/common/service/WxPayService.java

@@ -35,7 +35,7 @@ public interface WxPayService {
      */
     void processOrder(JSONObject jsonObject) throws GeneralSecurityException, InterruptedException;
 
-    String queryOrder(Long orderId) throws IOException;
+    String queryOrder(Long orderId) throws IOException, InterruptedException;
 
     /**
      * 退款

joying-common/src/main/java/com/fzm/common/service/impl/OrderServiceImpl.java

@@ -6,12 +6,13 @@ import com.fzm.common.entity.Order;
 import com.fzm.common.entity.dto.OrderDto;
 import com.fzm.common.entity.dto.OrderProcessMsg;
 import com.fzm.common.entity.vo.OrderVo;
-import com.fzm.common.enums.OrderStatus;
-import com.fzm.common.enums.PayScene;
+import com.fzm.common.enums.*;
+import com.fzm.common.exception.GlobalException;
 import com.fzm.common.mapper.OrderMapper;
 import com.fzm.common.service.CopyrightApplyService;
 import com.fzm.common.service.NftService;
 import com.fzm.common.service.OrderService;
+import com.fzm.common.service.WxPayService;
 import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.SnowflakeUtil;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,6 +51,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Resource
     private OrderMapper orderMapper;
 
+    @Resource
+    private WxPayService wxPayService;
+
     @Override
     public Order getByPaySceneAndProductId(Integer payScene, Integer productId, Integer orderStatus) {
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
@@ -135,4 +140,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         OrderProcessMsg orderProcessMsg = new OrderProcessMsg(orderId, productId, payScene);
         rabbitTemplate.convertAndSend("order-exchange", "order.process", orderProcessMsg);
     }
+
+    @Override
+    public Boolean renewOrderStatus(Long orderId) throws IOException, InterruptedException {
+        Order order = this.getById(orderId);
+        if (order == null) {
+            throw GlobalException.newException(ResultCode.DATA_ERROR, "unknown orderId: " + orderId);
+        }
+        if (PayType.WXPAY.getCode().equals(order.getPayType())) {
+            wxPayService.queryOrder(orderId);
+        }
+        return true;
+    }
 }

joying-common/src/main/java/com/fzm/common/service/impl/WxPayServiceImpl.java

@@ -193,10 +193,10 @@ public class WxPayServiceImpl implements WxPayService {
             if (lock.tryLock(10, TimeUnit.SECONDS)) {
                 Order order = orderService.getById(out_trade_no);
                 // 如果订单状态不是待支付,直接返回
-                if (!OrderStatus.PAYING.getStatus().equals(order.getOrderStatus())) {
-                    log.warn("当前订单已处理完成, 订单号:==> {}", out_trade_no);
-                    return;
-                }
+//                if (!OrderStatus.PAYING.getStatus().equals(order.getOrderStatus())) {
+//                    log.warn("当前订单已处理完成, 订单号:==> {}", out_trade_no);
+//                    return;
+//                }
                 Integer productId = order.getProductId();
                 // 订单支付成功后,给mq发送一条消息,处理nft发行或版权申请的状态
                 OrderProcessMsg orderProcessMsg = new OrderProcessMsg(out_trade_no, productId, order.getPayScene());
@@ -220,7 +220,7 @@ public class WxPayServiceImpl implements WxPayService {
 
 
     @Override
-    public String queryOrder(Long orderId) throws IOException {
+    public String queryOrder(Long orderId) throws IOException, InterruptedException {
         String url = String.format("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/%s?mchid=%s", orderId, wxPayProperties.getMchId());
         HttpGet httpGet = new HttpGet(url);
         httpGet.setHeader("Accept", "application/json");
@@ -229,6 +229,10 @@ public class WxPayServiceImpl implements WxPayService {
         String result = EntityUtils.toString(response.getEntity());
         log.info("查询微信支付订单状态, 当前订单号: {}, 返回结果:{}", orderId, result);
         JSONObject jsonObject = JSONUtil.parseObj(result);
+        // 支付成功
+        if (WxPayStatus.SUCCESS.getStatus().equals(jsonObject.getStr("trade_state"))) {
+            processOrder(jsonObject);
+        }
         return jsonObject.getStr("trade_state");
     }
 

joying-portal/src/main/java/com/fzm/portal/controller/OrderController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -58,5 +59,10 @@ public class OrderController {
         return ResponseModel.success(orders);
     }
 
+    @PostMapping("/renew-order-status")
+    @ApiOperation("更新订单状态")
+    public ResponseModel<Boolean> renewOrderStatus(@RequestParam Long orderId) throws IOException, InterruptedException {
+        return ResponseModel.success(orderService.renewOrderStatus(orderId));
+    }
 
 }