fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponIssueQueryInfo.java

@@ -61,7 +61,7 @@ public class CouponIssueQueryInfo implements Serializable {
     private BigDecimal amount;
 
     // 可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：趣纠课购买券 LIVE：直播课购买券  VIDEO：视频课购买券
-    private CouponCategoryEnum couponCategory;
+    private String couponCategory;
 
     // 可用品类
     private List<CouponCategoryEnum> couponCategoryList;
@@ -125,11 +125,11 @@ public class CouponIssueQueryInfo implements Serializable {
         this.couponType = couponType;
     }
 
-    public CouponCategoryEnum getCouponCategory() {
+    public String getCouponCategory() {
         return couponCategory;
     }
 
-    public void setCouponCategory(CouponCategoryEnum couponCategory) {
+    public void setCouponCategory(String couponCategory) {
         this.couponCategory = couponCategory;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -275,22 +275,26 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             }
         }
         userOrderVo = baseMapper.detailApp(param);
+
+        // 查询用户下单配置
+        String ret = redisCacheService.getUserOrderConfig(param.getUserId().toString(), userOrderVo.getOrderNo());
+        if (!StringUtils.isEmpty(ret)) {
+            UserPaymentOrderWrapper.PaymentOrderReqConfig config = UserPaymentOrderWrapper.PaymentOrderReqConfig
+                    .from(ret);
+            UserPaymentOrderWrapper.PaymentConfig build = UserPaymentOrderWrapper.PaymentConfig.builder()
+                    .orderNo(userOrderVo.getOrderNo())
+                    .paymentConfig(config)
+                    .paymentType(userOrderVo.getPaymentVendor())
+                    .build();
+            userOrderVo.setPaymentConfig(build);
+        }
+
         userOrderDetail(userOrderVo);
         return userOrderVo;
     }
 
     private void userOrderDetail( UserOrderVo userOrderVo) {
         if (null != userOrderVo) {
-            userOrderVo.setFeeAmt(null);
-            userOrderVo.setPlantformFee(null);
-            List<UserOrderDetailVo> orderDetilList = orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo());
-            orderDetilList.forEach(o -> {
-                o.setPlantformFee(null);
-                o.setPlantformFeeRate(null);
-            });
-            userOrderVo.setOrderDetailList(orderDetilList);
-
-
 
             // 计算优惠券金额
             CouponOrderWrapper couponOrderWrapper  = couponInfoService.queryUserOrderCouponInfo(userOrderVo.getUserId(),

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponIssueMapper.xml

@@ -63,7 +63,7 @@
                 and #{query.clientType} = ci.client_type_
             </if>
             <if test="query.couponCategory != null">
-                and #{query.couponCategory} = cou.category_
+                and find_in_set(cou.category_,#{query.couponCategory})
             </if>
             <if test="query.couponCategoryList != null and query.couponCategoryList.size() != 0">
                 and cou.category_ in