储值卡支付回调后调储交

order-application-service/src/main/java/cn/freemud/entities/dto/pay/svc/ConsumeHistoryCreateRequest.java

@@ -23,6 +23,9 @@ public class ConsumeHistoryCreateRequest {
     @ApiModelProperty("用户id")
     private String memberId;
 
+    @ApiModelProperty("门店")
+    private String storeId;
+
     @ApiModelProperty("储值卡流水号")
     private List<String> cardRequestNo;
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -366,7 +366,7 @@ public class OrderAdapterServiceImpl {
 
             //储值卡订单消费后通知储值交易服务
             if(CollectionUtils.isNotEmpty(message.getSvcPayItems())){
-                sendSvcPayInfoToSvcTransaction(message.getSvcPayItems(),orderBean.getCompanyId(),orderBean.getOid(),orderBean.getUserId());
+                sendSvcPayInfoToSvcTransaction(message.getSvcPayItems(),orderBean.getCompanyId(),orderBean.getOid(),orderBean.getUserId(),orderBean.getShopId());
             }
             return result;
         } catch (Exception e) {
@@ -448,12 +448,13 @@ public class OrderAdapterServiceImpl {
         return configStr;
     }
 
-    private void sendSvcPayInfoToSvcTransaction(List<SvcPayItem> svcPayItems,String partnerId,String orderCode,String memberId){
+    private void sendSvcPayInfoToSvcTransaction(List<SvcPayItem> svcPayItems,String partnerId,String orderCode,String memberId,String storeId){
         ConsumeHistoryCreateRequest request = new ConsumeHistoryCreateRequest();
         try {
             request.setPartnerId(partnerId);
             request.setOrderCode(orderCode);
             request.setMemberId(memberId);
+            request.setStoreId(storeId);
             List<String> svcTransIds = svcPayItems.stream().map(SvcPayItem::getSvcTransId).collect(Collectors.toList());
             request.setCardRequestNo(svcTransIds);