Merge branch 'feature/0721-tenant' into develop

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/payment/EPaymentChannel.java

@@ -12,6 +12,7 @@ public enum EPaymentChannel {
     ALIPAY_QR("alipay_qr", "支付宝正扫", 1),
     ALIPAY_WAP("alipay_wap", "支付宝H5支付", 1),
     WX_PUB("wx_pub", "微信公众号支付", 2),
+    WX_LITE("wx_lite", "微信小程序支付", 2),
     ;
 
     private final String msg;

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

@@ -747,7 +747,8 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         }
 
         // 微信支付，需要校验code值是否为空
-        if (EPaymentChannel.WX_PUB.getCode().equals(reqConfig.getPaymentChannel())
+        if ((EPaymentChannel.WX_PUB.getCode().equals(reqConfig.getPaymentChannel())
+                ||EPaymentChannel.WX_LITE.getCode().equals(reqConfig.getPaymentChannel()))
             && StringUtils.isBlank(reqConfig.getCode())) {
             throw new BizException("微信支付code值为空");
         }