Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -131,6 +131,9 @@ public class PayOrderLogic {
     @Autowired
     PayRecordService payRecordService;
 
+    @Autowired
+    AdminCompanyWechatPayConfigService adminCompanyWechatPayConfigService;
+
     public Page<WebsitNormCharge> pageCharge(String name, String categoryId, String orderId,Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         Page<WebsitNormCharge> list = websitNormChargeService.lambdaQuery()
@@ -602,9 +605,7 @@ public class PayOrderLogic {
 
                 workerOrder.setTranscationId(transcationId);
 
-                PayRecord payRecord = payRecordService.lambdaQuery().eq(PayRecord::getTransactionId, transcationId).one();
-
-                workerOrder.setOpenId(payRecord.getOpenId());
+                workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
             }
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -590,7 +590,7 @@ public class WechatLogic {
      * @param orderId 订单号
      * @param transacationId 微信支付流水号
      */
-    public void addPayWebsitRecord(AdminCompanyWechatPayConfig adminCompanyWechat,BigDecimal payment,String mobile,String openId,String ip,String tradeType,String orderId,String transacationId){
+    public void addPayWebsitRecord(AdminCompanyWechatPayConfig adminCompanyWechat,BigDecimal payment,String mobile,String openId,String ip,String tradeType,String orderId,String transacationId,String opendId){
         PayRecord payRecord = new PayRecord();
         payRecord.setCompanyWechatId(adminCompanyWechat.getCompanyWechatId());
         payRecord.setCompanyWechatName(adminCompanyWechat.getCompanyName());
@@ -603,6 +603,7 @@ public class WechatLogic {
         payRecord.setMobile(mobile);
         payRecord.setTradeType(tradeType);
         payRecord.setOutTradeNo(orderId);
+        payRecord.setOpenId(opendId);
         payRecord.setTransactionId(transacationId);
         payRecord.setCreateTime(new Date());
         payRecord.insert();
@@ -1229,7 +1230,7 @@ public class WechatLogic {
 
     public String paymentfkmWebsit(String id, BigDecimal payment, String profitSharingFlag, String ip, String configId, String authCode, String source) {
 
-        WxPayService payService = this.getPayWebstiService(configId,source);
+        WxPayService payService = this.getPayJaspWebstiService(configId,source);
 
         if (payService == null)
             throw new RemoteServiceException("未查到支付配置");
@@ -1257,7 +1258,7 @@ public class WechatLogic {
         //记录流水
 
         AdminCompanyWechatPayConfig adminCompanyWechatPayConfig = adminCompanyWechatPayConfigService.getById(configId);
-        this.addPayWebsitRecord(adminCompanyWechatPayConfig,payment,"",payResult.getSubOpenid(),ip,payResult.getTradeType(),id,payResult.getTransactionId());
+        this.addPayWebsitRecord(adminCompanyWechatPayConfig,payment,"",payResult.getSubOpenid(),ip,payResult.getTradeType(),id,payResult.getTransactionId(),payResult.getOpenid());
         return payResult.getTransactionId();
     }