Merge remote-tracking branch 'origin/ScrmStore'

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2035,11 +2035,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             //将钱退还给用户
             List<FsStorePaymentScrm> payments=paymentService.selectFsStorePaymentByOrderId(order.getId());
             if(payments!=null){
+                String json = configService.selectConfigByKey("store.pay");
+                FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
                 for(FsStorePaymentScrm payment:payments){
                     if (payment.getPayMode()==null||payment.getPayMode().equals("wx")){
                         WxPayConfig payConfig = new WxPayConfig();
-                        String json = configService.selectConfigByKey("store.pay");
-                        FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
                         payConfig.setAppId(fsPayConfig.getAppId());
                         payConfig.setMchId(fsPayConfig.getWxMchId());
                         payConfig.setMchKey(fsPayConfig.getWxMchKey());
@@ -2071,6 +2071,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
                         }
                     }else if (payment.getPayMode()!=null&&payment.getPayMode().equals("hf")){
                         V2TradePaymentScanpayRefundRequest request = new V2TradePaymentScanpayRefundRequest();
+                        request.setOrgHfSeqId(payment.getTradeNo());
+                        request.setHuifuId(fsPayConfig.getHuifuId());
                         request.setOrdAmt(payment.getPayMoney().toString());
                         request.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(payment.getCreateTime()));
                         request.setReqSeqId("refund-"+payment.getPayCode());