修改 卖券直播商品配置的静态路径读取 apollo

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/entities/vo/SellCouponCreateOrderVo.java

@@ -74,8 +74,4 @@ public class SellCouponCreateOrderVo {
     private String scene;
 
 
-    /**
-     * 视频卖券 需要带上该参数
-     */
-    private String productPath;
 }

order-application-service/src/main/java/cn/freemud/handler/WeChatLiveMsgHandle.java

@@ -49,6 +49,9 @@ public class WeChatLiveMsgHandle {
     @Value("${wechat.live.order.path:}")
     private String path;
 
+    @Value("${wechat.live.order.product.path:}")
+    private String productPath;
+
     @Autowired
     private EcologyAdminApplicationClient ecologyAdminApplicationClient;
 
@@ -119,10 +122,10 @@ public class WeChatLiveMsgHandle {
      * @param prepayOrder
      */
     public BaseResponse reportOrder(CreatePrepayRequestDto createPrepayRequestDto,
-                                    CreateOrderResponseVo prepayOrder, String scene, String productPath) {
+                                    CreateOrderResponseVo prepayOrder, String scene) {
         AppLogUtil.printLog("视频直播订单-参数组装", JSON.toJSONString(createPrepayRequestDto), JSON.toJSONString(prepayOrder));
         // 组装 request
-        OrderCreateRequestVO requestVO = this.getOrderCreateRequest(createPrepayRequestDto, prepayOrder, scene, productPath);
+        OrderCreateRequestVO requestVO = this.getOrderCreateRequest(createPrepayRequestDto, prepayOrder, scene);
 
         // 获取 session
         String accessToken = this.getAccessToken(createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPartnerId());
@@ -214,8 +217,7 @@ public class WeChatLiveMsgHandle {
 
     private OrderCreateRequestVO getOrderCreateRequest(CreatePrepayRequestDto createPrepayRequestDto,
                                                        CreateOrderResponseVo prepayOrder,
-                                                       String scene,
-                                                       String productPath) {
+                                                       String scene) {
         OrderCreateRequestVO requestVO = new OrderCreateRequestVO();
         OrderBeanV1 orderBean = createPrepayRequestDto.getProductOrderBean();
 
@@ -239,13 +241,13 @@ public class WeChatLiveMsgHandle {
         requestVO.setDelivery_detail(deliveryDetail);
 
         // 组装商品参数
-        OrderCreateRequestVO.OrderDetail orderDetail = this.getOrderDetail(orderBean, prepayOrder, productPath);
+        OrderCreateRequestVO.OrderDetail orderDetail = this.getOrderDetail(orderBean, prepayOrder);
         requestVO.setOrder_detail(orderDetail);
 
         return requestVO;
     }
 
-    private OrderCreateRequestVO.OrderDetail getOrderDetail(OrderBeanV1 orderBean, CreateOrderResponseVo prepayOrder, String productPath) {
+    private OrderCreateRequestVO.OrderDetail getOrderDetail(OrderBeanV1 orderBean, CreateOrderResponseVo prepayOrder) {
         OrderCreateRequestVO.OrderDetail detail = new OrderCreateRequestVO.OrderDetail();
 
         // payinfo
@@ -275,7 +277,7 @@ public class WeChatLiveMsgHandle {
             productInfo.setHead_img(p.getPicture());
             productInfo.setTitle(p.getProductName());
             // fisherman 虚拟商品的 path 未知
-            productInfo.setPath(productPath);
+            productInfo.setPath(productPath + p.getProductId());
 
             productInfos.add(productInfo);
         });

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

@@ -450,7 +450,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         CreateOrderResponseVo prepayOrder = payService.createPrepayOrder(createPrepayRequestDto);
         // fisherman 视频卖券 需要拼装额外对象 给前端
         if (StringUtils.isNotBlank(requestVo.getScene()) && CreateOrderSceneEnum.verifySceneOrder.contains(requestVo.getScene())) {
-            BaseResponse<WeChatReportVO> baseResponse = weChatLiveMsgHandle.reportOrder(createPrepayRequestDto, prepayOrder, requestVo.getScene(), requestVo.getProductPath());
+            BaseResponse<WeChatReportVO> baseResponse = weChatLiveMsgHandle.reportOrder(createPrepayRequestDto, prepayOrder, requestVo.getScene());
             if (ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())) {
                 WeChatReportVO weChatReportVO = baseResponse.getResult();
                 OrderCreateRequestVO requestVO = weChatReportVO.getRequestVO();