卖券订单更新订单

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -13,6 +13,8 @@ import cn.freemud.entities.Active;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.pay.OrderPayResponse;
+import cn.freemud.entities.dto.pay.PayOrderDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.product.GetValidateProductInfoDto;
 import cn.freemud.entities.dto.product.ProductInfo;
@@ -482,11 +484,42 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getData().getResultCode())) {
             return ResponseUtil.error(orderInfoReqsBaseResponse.getCode(), "支付异常," + response.getData().getResultMsg());
         }
+
+        updatExtInfo(response.getData(), appId,createPrepayRequestDto);
+
         //唤起支付返回参数
         checkOrder.convent2CreateOrderResponseVo(createOrderResponseVo, appId, response.getData());
         return ResponseUtil.success(createOrderResponseVo);
     }
 
+    public void convent2CreateOrderResponseVo(OrderPayResponse createOrderResponseVo, String appId, FacePayResponseDto response){
+        createOrderResponseVo.setWxAppid(appId);
+        createOrderResponseVo.setFmId(response.getFmId());
+//        createOrderResponseVo.setEndTransId(response.getEndTransId());
+//        createOrderResponseVo.setPaySuccess(false);
+        String payOrderDto = response.getPayOrder();
+        PayOrderDto payOrderBean = JSONObject.parseObject(payOrderDto, PayOrderDto.class);
+        if (null != payOrderBean) {
+            OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
+            payBean.setAppid(payOrderBean.getAppid());
+            payBean.setNonceStr(payOrderBean.getNonceStr());
+            payBean.setPackageX(payOrderBean.getPackageX());
+            payBean.setSign(payOrderBean.getPaySign());
+            payBean.setSignType(payOrderBean.getSignType());
+            payBean.setTimestamp(payOrderBean.getTimestamp());
+            payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
+            createOrderResponseVo.setPayOrder(payBean);
+            createOrderResponseVo.setThirdOrderId(payOrderBean.getThirdPartTradeNo());
+            createOrderResponseVo.setThirdOrderToken(payOrderBean.getBizContent());
+        }
+    }
+
+
+    public void updatExtInfo(FacePayResponseDto response , String appId,CreatePrepayRequestDto createPrepayRequestDto){
+        OrderPayResponse createOrderResponseVo  = new OrderPayResponse();
+        convent2CreateOrderResponseVo(createOrderResponseVo, appId,response);
+        BaseResponse baseEditResponse = payService.updateOrderInfo(createOrderResponseVo, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
+    }
 
     /**
      * 效验虚拟商品活动信息