Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of…

Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java

@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.order.PayConfigVo;
 import cn.freemud.entities.vo.order.PaySuccessDataVo;
+import cn.freemud.entities.vo.order.VirtualStoreVo;
 import cn.freemud.service.ExposureOrderService;
 import cn.freemud.service.RefundService;
 import cn.freemud.service.impl.OrderQueueService;
@@ -132,6 +133,12 @@ public class ExposureOrderController {
         return ResponseUtil.success(exposureOrderService.getVirtualStore(req.getAppId(), req.getType()));
     }
 
+    @ApiAnnotation(logMessage = "查询订单宝购买储值卡配置的支付虚拟门店信息")
+    @PostMapping("/getPayVirtualStore")
+    public BaseResponse<VirtualStoreVo> getPayVirtualStore(@Validated @LogParams @RequestBody GetPayVirtualStoreRequest req) {
+        return ResponseUtil.success(exposureOrderService.getPayVirtualStore(req.getPartnerId(), req.getType()));
+    }
+
     /**
      * 查询支付配置paycode
      */

order-application-service/src/main/java/cn/freemud/entities/vo/GetPayVirtualStoreRequest.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class GetPayVirtualStoreRequest {
+
+    @NotBlank(message = "商户号不能为空")
+    private String partnerId;
+
+    private String appId;
+
+    /**
+     * @see cn.freemud.enums.AggregationTypeEnum
+     */
+    @NotBlank
+    private String type;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/VirtualStoreVo.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+@Data
+public class VirtualStoreVo {
+
+    /**
+     * 虚拟门店关联的appid
+     */
+    private String appId;
+
+    /**
+     * 支付门店
+     */
+    private String storeId;
+
+}

order-application-service/src/main/java/cn/freemud/enums/AggregationTypeEnum.java

@@ -33,7 +33,7 @@ public enum  AggregationTypeEnum {
      * 虚拟卖券分账支付门店
      */
     TYPE_11("11","虚拟卖券分账支付门店"),
-    TYPE_12("12",""),
+    TYPE_12("12","储值卡支付门店"),
     /**
      * 视频号卖券支付门店
      */

order-application-service/src/main/java/cn/freemud/service/ExposureOrderService.java

@@ -6,6 +6,7 @@ import cn.freemud.entities.vo.GetPayConfigVo;
 import cn.freemud.entities.vo.GetPaySuccessDataV2Request;
 import cn.freemud.entities.vo.order.PayConfigVo;
 import cn.freemud.entities.vo.order.PaySuccessDataVo;
+import cn.freemud.entities.vo.order.VirtualStoreVo;
 import cn.freemud.enums.AggregationTypeEnum;
 import cn.freemud.enums.OrderTackCodeFactory;
 import cn.freemud.enums.TakeCodeOrderType;
@@ -101,6 +102,20 @@ public class ExposureOrderService {
     }
 
     /**
+     * 订单宝暂无appid，返回支付关联的appid用于储值校验记录支付退款用，
+     * 后续有订单宝appid时，这个接口废弃
+     */
+    public VirtualStoreVo getPayVirtualStore(String partnerId, String type) {
+        //订单宝购买储值卡支付虚拟门店，订单宝暂无appid
+        AssortmentOpenPlatformIappWxappStore virtualStore = payService.getVirtualStore(partnerId, type);
+        VirtualStoreVo resp = new VirtualStoreVo();
+        resp.setStoreId(virtualStore == null ? "" : virtualStore.getStoreId());
+        resp.setAppId(virtualStore == null ? "" : virtualStore.getWxAppId());
+        return resp;
+
+    }
+
+    /**
      * 查询支付配置paycode
      */
     public String getPayCode(GetPayCodeVo req) {

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

@@ -1251,6 +1251,17 @@ public class PayServiceImpl {
         return wxAppStore;
     }
 
+    public AssortmentOpenPlatformIappWxappStore getVirtualStore(String partnerId, String aggregationType) {
+        AssortmentOpenPlatformIappWxappStore wxappStore = new AssortmentOpenPlatformIappWxappStore();
+        wxappStore.setPartnerId(partnerId);
+        wxappStore.setAggregationType(aggregationType);
+        List<AssortmentOpenPlatformIappWxappStore> virtualStoreList = assortmentOpenPlatformIappWxappStoreManager.queryList(wxappStore);
+        if(CollectionUtils.isEmpty(virtualStoreList)){
+            return null;
+        }
+        return virtualStoreList.get(virtualStoreList.size()-1);
+    }
+
 
     public UnifiedOrderRequestDto convert2UnifiedOrderRequestDto(UnifiedOrderCom com) {