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

mall-server-api/src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -26,6 +26,10 @@ public class Constant {
 
     public final static List<String> INIT_INCR_LIST = Arrays.asList("WEBSIT_ID");
 
+    public final static String COMPANY_PAY_CONFIG_1 = "电子支付";
+
+    public final static String COMPANY_PAY_CONFIG_2 = "保险支付";
+
     public class Ali {
         public final static String ACCESS_KEY_ID = "LTAI4GK1q4mnpCFbonMd1pji";
         public final static String ACCESS_KEY_SECERT = "E5LW0V1H8HBxqjKkExIxaXUgSyex6C";

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyPayConfigLogic.java

@@ -56,6 +56,10 @@ public class AdminCompanyPayConfigLogic {
             throw new RemoteServiceException("电子商户名称不能为空");
         }
 
+        if (StringUtils.isBlank(bean.getAttr())) {
+            throw new RemoteServiceException("商户属性不能为空");
+        }
+
         if (StringUtils.isBlank(bean.getAppId())) {
             throw new RemoteServiceException("appid不能为空");
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -10,6 +10,7 @@ import com.gree.mall.manager.bean.admin.AdminWebsitNewBean;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
 import com.gree.mall.manager.bean.admin.reqDto.AdminUserAddReqBean;
 import com.gree.mall.manager.bean.workorder.AdminWebsitList;
+import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
@@ -625,6 +626,7 @@ public class AdminWebsitLogic {
             String payName = row.get(5).toString().trim();
             final AdminCompanyWechatPayConfig wechatPayConfig = adminCompanyWechatPayConfigService.lambdaQuery()
                     .eq(AdminCompanyWechatPayConfig::getPayMerchantName, payName)
+                    .like(AdminCompanyWechatPayConfig::getAttr, Constant.COMPANY_PAY_CONFIG_1)
                     .one();
             if (Objects.isNull(wechatPayConfig)) {
                 throw new RemoteServiceException("第" + rowIndex + "行, 电子支付商户不存在");