fix:添加测试订单完成接口

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/config/ResourceServerConfig.java

@@ -27,7 +27,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
             .authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
                 .and()
                 .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*","/payment/callback/**",
-                 "/order/paySuccess","/order/cancelUserOrder")
+                 "/order/paySuccess/test")
             .permitAll().anyRequest().permitAll().and().httpBasic();
     }
 

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/OmsPortalOrderController.java

@@ -128,4 +128,12 @@ public class OmsPortalOrderController {
         portalOrderService.deleteOrder(orderId);
         return CommonResult.success(null);
     }
+
+    @ApiOperation("用户支付成功的回调")
+    @RequestMapping(value = "/paySuccess/test", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult paySuccessTest(@RequestParam Long orderId,@RequestParam Integer payType) {
+        Integer count = portalOrderService.paySuccess(orderId,payType);
+        return CommonResult.success(count, "支付成功");
+    }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OrderPayRes.java

@@ -23,6 +23,8 @@ public class OrderPayRes {
     @JsonIgnore
     private String message;
 
+    @ApiModelProperty("支付单号")
+    private String paymentNo;
 
 
     @ApiModelProperty(value = "订单编号",required = true)
@@ -91,4 +93,12 @@ public class OrderPayRes {
     public void setTransNo(String transNo) {
         this.transNo = transNo;
     }
+
+    public String getPaymentNo() {
+        return paymentNo;
+    }
+
+    public void setPaymentNo(String paymentNo) {
+        this.paymentNo = paymentNo;
+    }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.portal.dao.PortalProductDao;
 import com.yonge.cooleshow.portal.dto.OrderPayReq;
 import com.yonge.cooleshow.portal.dto.OrderPayRes;
@@ -585,6 +586,18 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
         saveOrderPayment(executePayment.getData(), detail,payReq.getPaymentClient());
 
+        if (executePayment.getStatus()) {
+            orderPayRes.setPay_amt(detail.getPayAmount().setScale(2, RoundingMode.HALF_UP).toString());
+            String pay_info = executePayment.getData().getPayInfo();
+            orderPayRes.setPay_info(pay_info);
+            orderPayRes.setPayChannel(payReq.getPayChannel().getCode());
+            orderPayRes.setPaymentNo(payment.getPaymentNo());
+            orderPayRes.setStatus(true);
+
+        } else {
+            orderPayRes.setMessage(executePayment.getMsg());
+            orderPayRes.setStatus(false);
+        }
         return orderPayRes;
     }