Merge branch 'feature/暴露查询虚拟门店接口'

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

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

@@ -113,4 +113,13 @@ public class ExposureOrderController {
         payService.putPayQueryDelMq(putDeadLetterVo.getPartnerId(), putDeadLetterVo.getStoreId(), putDeadLetterVo.getFmId(), putDeadLetterVo.getOrderId(), putDeadLetterVo.getPayChanelType());
         return ResponseUtil.success();
     }
+    /**
+     * 查询支付虚拟门店配置
+     */
+    @ApiAnnotation(logMessage = "查询支付虚拟门店配置")
+    @PostMapping("/getVirtualStore")
+    public BaseResponse<String> getVirtualStore(@Validated @LogParams @RequestBody GetVirtualStoreRequest req) {
+        return ResponseUtil.success(exposureOrderService.getVirtualStore(req.getAppId(), req.getType()));
+    }
+
 }

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: GetMallPayConfigVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-24 下午5:51
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class GetVirtualStoreRequest {
+
+    @NotBlank(message = "商户号不能为空")
+    private String partnerId;
+
+    @NotBlank(message = "小程序id不能为空")
+    private String appId;
+
+    /**
+     * @see cn.freemud.enums.AggregationTypeEnum
+     */
+    @NotBlank
+    private String type;
+
+}

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

@@ -14,7 +14,7 @@ public enum  AggregationTypeEnum {
      */
     TYPE_6("6","会员卡支付门店"),
     /**
-     * 微商城支付门店
+     * 微商城支付门店(FM商城）
      */
     TYPE_7("7","微商城支付门店"),
     /**

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

@@ -72,4 +72,15 @@ public class ExposureOrderService {
         vo.setStoreId(wxAppStore.getStoreId());
         return vo;
     }
+
+    /**
+     * 查询支付虚拟门店配置
+     * @param appId 小程序应用appId
+     * @param type 虚拟门店类型 {@link AggregationTypeEnum}
+     * @return 虚拟门店号
+     */
+    public String getVirtualStore(String appId, String type) {
+        AssortmentOpenPlatformIappWxappStore wxAppStore = payService.getIappWxappStoreInfo(appId, type);
+        return wxAppStore == null ? "" : wxAppStore.getStoreId();
+    }
 }