斗拱支付

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -21,6 +21,7 @@ import com.qs.mp.channel.domain.param.OrderPayParam;
 import com.qs.mp.channel.domain.vo.PromoterVO;
 import com.qs.mp.channel.service.IPromoterUserService;
 import com.qs.mp.common.constant.Constants;
+import com.qs.mp.common.constant.PayConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -25,7 +25,6 @@ import com.qs.mp.channel.domain.ChannelWithdraw;
 import com.qs.mp.channel.service.IChannelGoodsOrderService;
 import com.qs.mp.channel.service.IChannelGoodsSettleOrderService;
 import com.qs.mp.channel.service.IChannelOrderService;
-import com.qs.mp.common.constant.Constants;
 import com.qs.mp.channel.service.IChannelWithdrawService;
 import com.qs.mp.common.constant.YsPayMethodConstants;
 import com.qs.mp.common.constant.YsServerApiConstants;
@@ -583,13 +582,13 @@ public class WalletServiceImpl implements IWalletService {
    */
   public Map<String, String> createJSAPIOrderDougong(int payAmt,String openId, String clientType,String appId, BizTypeEnum bizType, String bizId, String orderRemark) throws ServiceException {
     String tradeType;
-    if(Constants.PAY_STYLE_WX.equals(clientType)){
-      tradeType = Constants.DOUGONG_TRADE_TYPE_MINIAPP;
-      String payStyle = Constants.PAY_STYLE_WXMINI_DOUGONG;
+    if(com.qs.mp.common.constant.Constants.PAY_STYLE_WX.equals(clientType)){
+      tradeType = com.qs.mp.common.constant.Constants.DOUGONG_TRADE_TYPE_MINIAPP;
+      String payStyle = com.qs.mp.common.constant.Constants.PAY_STYLE_WXMINI_DOUGONG;
       return wxCreateJSAPIOrderWxminiDougong(payAmt,openId,tradeType,payStyle,appId, bizType, bizId, orderRemark);
-    }else if(Constants.PAY_STYLE_ALI.equals(clientType)){
-      tradeType = Constants.DOUGONG_TRADE_TYPE_ALIJS;
-      String payStyle = Constants.PAY_STYLE_ALIMINI_DOUGONG;
+    }else if(com.qs.mp.common.constant.Constants.PAY_STYLE_ALI.equals(clientType)){
+      tradeType = com.qs.mp.common.constant.Constants.DOUGONG_TRADE_TYPE_ALIJS;
+      String payStyle = com.qs.mp.common.constant.Constants.PAY_STYLE_ALIMINI_DOUGONG;
       return aliCreateJSAPIOrderMiniDougong(payAmt,openId,tradeType,payStyle, bizType, bizId, orderRemark);
     }
     return Maps.newHashMap();
@@ -614,7 +613,7 @@ public class WalletServiceImpl implements IWalletService {
     DougongPayRequestParam wxRequestParam = new DougongPayRequestParam();
     wxRequestParam.setTradesOrderId(orderId);
     wxRequestParam.setTotalFee(payAmt);
-    wxRequestParam.setTradeType(Constants.PAY_STYLE_WXMINI_DOUGONG);
+    wxRequestParam.setTradeType(com.qs.mp.common.constant.Constants.PAY_STYLE_WXMINI_DOUGONG);
     wxRequestParam.setOpenid(code);
     List<PaymentConfig> paymentConfigList = dougongPayApi.getAvailablePaymentConfigList();
     PaymentConfig paymentConfig = CollectionUtil.isNotEmpty(paymentConfigList) ? RandomUtil.randomEle(paymentConfigList) : null;
@@ -657,9 +656,9 @@ public class WalletServiceImpl implements IWalletService {
       payMap.put("paySign", paySign);
       payMap.put("timeStamp", timeStamp);
       String respCode = payMap.get("respCode");
-      LogUtil.info(logger,"success status:{}", Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode));
+      LogUtil.info(logger,"success status:{}", com.qs.mp.common.constant.Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode));
 
-      if (Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode)) {
+      if (com.qs.mp.common.constant.Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode)) {
 
         //插入支付订单记录
         PayOrder payOrder = new PayOrder();
@@ -714,7 +713,7 @@ public class WalletServiceImpl implements IWalletService {
     PaymentConfig paymentConfig = CollectionUtil.isNotEmpty(paymentConfigList) ? RandomUtil.randomEle(paymentConfigList) : null;
 
     dougongPayRequestParam.setAppid(Objects.nonNull(paymentConfig) ? paymentConfig.getAliPid() : "");
-    dougongPayRequestParam.setTradeType(Constants.PAY_STYLE_ALIMINI_DOUGONG);
+    dougongPayRequestParam.setTradeType(com.qs.mp.common.constant.Constants.PAY_STYLE_ALIMINI_DOUGONG);
     dougongPayRequestParam.setOpenid(code);
     String huifuPayId = orderId + "D" + KeyGenUtil.newKeyTimestamp();
     dougongPayRequestParam.setHuifuPayId(huifuPayId);
@@ -735,7 +734,7 @@ public class WalletServiceImpl implements IWalletService {
         String memberId = payInfoJson.getString("memberId");
         LogUtil.info(logger,"dougong-ali payinfo--tradeNo:{},memberId:{}",tradeNO,memberId);
         payMap.put("tradeNO", tradeNO);
-        LogUtil.info(logger, "success status:{},respCode:{}", Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode),respCode);
+        LogUtil.info(logger, "success status:{},respCode:{}", com.qs.mp.common.constant.Constants.DOUGONG_ORDER_SUCCESS_CODE.equals(respCode),respCode);
       }else{
         payMap.put("payInfo",jsonData);
       }