优化WX_LITE支付方式

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxLite.java

@@ -27,8 +27,8 @@ import com.jeequan.jeepay.pay.model.MchAppConfigContext;
 import com.jeequan.jeepay.pay.rqrs.AbstractRS;
 import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
 import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRS;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRQ;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRS;
 import com.jeequan.jeepay.pay.util.ApiResBuilder;
 import com.jeequan.jeepay.response.PayOrderCreateResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,7 @@ public class WxLite extends PlspayPaymentService {
 
     @Override
     public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
-        WxJsapiOrderRQ bizRQ = (WxJsapiOrderRQ) rq;
+        WxLiteOrderRQ bizRQ = (WxLiteOrderRQ) rq;
         if (StringUtils.isEmpty(bizRQ.getOpenid())) {
             throw new BizException("[openid]不可为空");
         }
@@ -57,9 +57,9 @@ public class WxLite extends PlspayPaymentService {
 
     @Override
     public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception {
-        WxJsapiOrderRQ bizRQ = (WxJsapiOrderRQ) rq;
+        WxLiteOrderRQ bizRQ = (WxLiteOrderRQ) rq;
         // 构造函数响应数据
-        WxJsapiOrderRS res = ApiResBuilder.buildSuccess(WxJsapiOrderRS.class);
+        WxLiteOrderRS res = ApiResBuilder.buildSuccess(WxLiteOrderRS.class);
         ChannelRetMsg channelRetMsg = new ChannelRetMsg();
         res.setChannelRetMsg(channelRetMsg);
         try {

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxLite.java

@@ -26,14 +26,14 @@ import com.jeequan.jeepay.core.entity.PayOrder;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.pay.channel.wxpay.WxpayPaymentService;
 import com.jeequan.jeepay.pay.channel.wxpay.kits.WxpayKit;
+import com.jeequan.jeepay.pay.model.MchAppConfigContext;
 import com.jeequan.jeepay.pay.model.WxServiceWrapper;
 import com.jeequan.jeepay.pay.rqrs.AbstractRS;
-import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRS;
 import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
+import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRQ;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRS;
 import com.jeequan.jeepay.pay.util.ApiResBuilder;
-import com.jeequan.jeepay.pay.model.MchAppConfigContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -52,7 +52,7 @@ public class WxLite extends WxpayPaymentService {
     @Override
     public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
 
-        WxJsapiOrderRQ bizRQ = (WxJsapiOrderRQ) rq;
+        WxLiteOrderRQ bizRQ = (WxLiteOrderRQ) rq;
         if(StringUtils.isEmpty(bizRQ.getOpenid())){
             throw new BizException("[openid]不可为空");
         }
@@ -63,7 +63,7 @@ public class WxLite extends WxpayPaymentService {
     @Override
     public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception{
 
-        WxJsapiOrderRQ bizRQ = (WxJsapiOrderRQ) rq;
+        WxLiteOrderRQ bizRQ = (WxLiteOrderRQ) rq;
 
         WxPayUnifiedOrderRequest req = buildUnifiedOrderRequest(payOrder, mchAppConfigContext);
         req.setTradeType(WxPayConstants.TradeType.JSAPI);
@@ -74,7 +74,7 @@ public class WxLite extends WxpayPaymentService {
         }
 
         // 构造函数响应数据
-        WxJsapiOrderRS res = ApiResBuilder.buildSuccess(WxJsapiOrderRS.class);
+        WxLiteOrderRS res = ApiResBuilder.buildSuccess(WxLiteOrderRS.class);
         ChannelRetMsg channelRetMsg = new ChannelRetMsg();
         res.setChannelRetMsg(channelRetMsg);
 

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxLite.java

@@ -28,8 +28,8 @@ import com.jeequan.jeepay.pay.model.WxServiceWrapper;
 import com.jeequan.jeepay.pay.rqrs.AbstractRS;
 import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
 import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRQ;
-import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxJsapiOrderRS;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRQ;
+import com.jeequan.jeepay.pay.rqrs.payorder.payway.WxLiteOrderRS;
 import com.jeequan.jeepay.pay.util.ApiResBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -53,7 +53,7 @@ public class WxLite extends WxpayPaymentService {
     @Override
     public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception{
 
-        WxJsapiOrderRQ bizRQ = (WxJsapiOrderRQ) rq;
+        WxLiteOrderRQ bizRQ = (WxLiteOrderRQ) rq;
         WxServiceWrapper wxServiceWrapper = configContextQueryService.getWxServiceWrapper(mchAppConfigContext);
         WxPayService wxPayService = wxServiceWrapper.getWxPayService();
         wxPayService.getConfig().setTradeType(WxPayConstants.TradeType.JSAPI);
@@ -82,7 +82,7 @@ public class WxLite extends WxpayPaymentService {
         }
 
         // 构造函数响应数据
-        WxJsapiOrderRS res = ApiResBuilder.buildSuccess(WxJsapiOrderRS.class);
+        WxLiteOrderRS res = ApiResBuilder.buildSuccess(WxLiteOrderRS.class);
         ChannelRetMsg channelRetMsg = new ChannelRetMsg();
         res.setChannelRetMsg(channelRetMsg);
 

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRQ.java

@@ -106,7 +106,7 @@ public class UnifiedOrderRQ extends AbstractMchAppRQ {
             QrCashierOrderRQ bizRQ = JSONObject.parseObject(StringUtils.defaultIfEmpty(this.channelExtra, "{}"), QrCashierOrderRQ.class);
             BeanUtils.copyProperties(this, bizRQ);
             return bizRQ;
-        }else if(CS.PAY_WAY_CODE.WX_JSAPI.equals(wayCode) || CS.PAY_WAY_CODE.WX_LITE.equals(wayCode)){
+        }else if(CS.PAY_WAY_CODE.WX_JSAPI.equals(wayCode)){
             WxJsapiOrderRQ bizRQ = JSONObject.parseObject(StringUtils.defaultIfEmpty(this.channelExtra, "{}"), WxJsapiOrderRQ.class);
             BeanUtils.copyProperties(this, bizRQ);
             return bizRQ;