diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java index dadc41fa..2588a808 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java @@ -49,7 +49,7 @@ public class LakalaServiceImpl implements LakalaService { @Value("${lakala.lkl_platform_cer_path}") private String lklNotifyCerPath; //拉卡拉支付平台证书地址2(用于拉卡拉通知验签) - // 可选的两个参数 + //### 可选的两个参数,不同的店铺商家,可以数据库里配置不同的商户号和终端号 @Value("${lakala.merchant_no}") public String merchantNo; // 拉卡拉分配的商户号 @Value("${lakala.term_no}") @@ -148,6 +148,7 @@ public class LakalaServiceImpl implements LakalaService { // 41:NATIVE((ALIPAY,云闪付支持,京东白条分期)51:JSAPI(微信公众号支付,支付宝服务窗支付,银联JS支付,翼支付JS支付、拉卡拉钱包支付)71:微信小程序支付 61:APP支付(微信APP支付) v3LabsTransPreorderWechatReq.setTransType("51"); v3LabsTransPreorderWechatReq.setTotalAmount(totalAmount); + v3LabsTransPreorderWechatReq.setSettleType("1"); //“0”或者空,常规结算方式,如需接拉卡拉分账通需传“1”,商户未开通分账之前切记不用上送此参数。; v3LabsTransPreorderWechatReq.setNotifyUrl(notifyURL); v3LabsTransPreorderWechatReq.setRemark(remark); diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java index a8a1369a..ec6a81ac 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java @@ -193,10 +193,15 @@ public class PayConsumeDepositServiceImpl extends BaseServiceImpl deposit_column_row = new QueryWrapper<>(); deposit_column_row.eq("order_id", order_id); diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java index 3c085b0c..d17f919b 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java @@ -1297,8 +1297,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl tradeQueryWrapper = new QueryWrapper<>(); tradeQueryWrapper.eq("order_id", order_id); PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper); @@ -1308,7 +1308,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl channelQueryWrapper = new QueryWrapper<>(); channelQueryWrapper.eq("payment_channel_code", "lakala"); @@ -1316,7 +1316,6 @@ public class PayUserPayServiceImpl extends BaseServiceImpl