修改支付

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -93,7 +93,7 @@ public class BaseOrderController extends CommonBaseController {
         orderPayVo.setBody(baseOrder.getName());
         orderPayVo.setBuyerIp(StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
         orderPayVo.setChannel(PayChannelEnum.ORDER_CRT.getCode());
-        orderPayVo.setNotifyUrl(host+ order+ notifyUrl);
+        orderPayVo.setNotifyUrl(host+ order+ notifyUrl+ "?orderNo="+ baseOrder.getNo());
         orderPayVo.setSubject(baseOrder.getName());
         orderPayVo.setUserId(baseOrder.getUserId());
         ObjectRestResponse response = BeanUtil.toBean(thirdFeign.wx(orderPayVo), ObjectRestResponse.class);
@@ -101,20 +101,20 @@ public class BaseOrderController extends CommonBaseController {
                 //.data(PageDataVO.pageInfo(query.getPage(), query.getLimit(), baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-    @RequestMapping(value = "/notifyUrl",method = RequestMethod.POST)
+    @RequestMapping(value = "/notifyUrl",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单支付回调")
     @IgnoreClientToken
-    public ObjectRestResponse notifyUrl(@RequestBody NotifyUrlDTO dto){
+    public ObjectRestResponse notifyUrl(NotifyUrlDTO dto){
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
-        if(STATUS_SUCCESS.equals(dto.getStatus()) && StrUtil.isNotBlank(dto.getOrderNo())){
+        if(StrUtil.isNotBlank(dto.getOrderNo())){
             BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
                 setNo(dto.getOrderNo());
             }});
 
             if(OrderStatusEnum.ORDER_UNPAY.equals(baseOrder.getStatus())) {
                 baseOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                baseOrder.setOutTradeNo(dto.getOutTradeNo());
+                baseOrder.setOutTradeNo(dto.getTradeNo());
                 baseOrderBiz.updateById(baseOrder);
             }else {
                 log.info(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
@@ -151,10 +151,7 @@ public class BaseOrderController extends CommonBaseController {
         private String orderNo;
 
         //订单号
-        @ApiModelProperty(value = "订单号")
-        private String outTradeNo;
-
-        @ApiModelProperty(value = "支付是否成功 1：成功；2：失败")
-        private Integer status;
+        @ApiModelProperty(value = "支付订单（流水）号")
+        private String tradeNo;
     }
 }
\ No newline at end of file