no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/StorageVO.java

@@ -16,7 +16,6 @@ public class StorageVO   {
     @ApiModelProperty(value = "仓储id")
     private String storageId;
 
-    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

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

@@ -170,7 +170,7 @@ public class AdminUserLogic {
                 Integer existCount = websitContractSignRecordService.lambdaQuery()
                         .eq(WebsitContractSignRecord::getWebsitId, websit.getWebsitId())
                         .eq(WebsitContractSignRecord::getStatus, SignContractStatusEnum.OK.getKey())
-                        .le(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDate(DateUtil.date()))
+                        .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                         .count();
                 // 没有签成功并且审核通过未过期的记录，进行下一步检查
                 if (existCount == 0) {
@@ -179,7 +179,7 @@ public class AdminUserLogic {
                     existCount = websitContractSignRecordService.lambdaQuery()
                             .eq(WebsitContractSignRecord::getWebsitId, websit.getWebsitId())
                             .in(WebsitContractSignRecord::getStatus, SignContractStatusEnum.WAIT_SIGN.getKey(), SignContractStatusEnum.WAIT.getKey())
-                            .le(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDate(DateUtil.date()))
+                            .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                             .isNull(WebsitContractSignRecord::getCancelTime)
                             .count();
                     if (existCount == 0) {

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

@@ -1014,12 +1014,26 @@ public class AdminWebsitLogic {
                 .list();
 
         List<String> titleList = new ArrayList<>();
+        titleList.add("所属公司");
         titleList.add("网点编号");
         titleList.add("网点名称");
+        titleList.add("网点属性");
+        titleList.add("网点级别");
+        titleList.add("企业法人");
+        titleList.add("法人手机");
+        titleList.add("法人身份证");
         titleList.add("联系人");
+        titleList.add("联系电话");
         titleList.add("详细地址");
         titleList.add("电子支付商户名称");
+        titleList.add("保险类型");
+        titleList.add("保险支付商户号");
+        titleList.add("工伤险代买单位");
         titleList.add("状态");
+        titleList.add("办公电话");
+        titleList.add("开户银行");
+        titleList.add("银行账号");
+        titleList.add("邮箱");
         titleList.add("通联支付开关");
 
         if (CollectionUtil.isEmpty(websitList)) {
@@ -1038,12 +1052,21 @@ public class AdminWebsitLogic {
                 .eq(org.apache.commons.lang3.StringUtils.isNotBlank(companyId), AdminCompanyWechatPayConfig::getCompanyWechatId, companyId)
                 .list();
 
+        final List<SysDictCompany> steadUnitList = sysDictCompanyService.lambdaQuery()
+                .eq(SysDictCompany::getCompanyWechatId, companyId)
+                .eq(SysDictCompany::getDictType, "INSURE_STEAD_UNIT")
+                .list();
+
+
         final Map<String, AdminCompanyWechatPayConfig> wechatPayConfigMap = wechatPayConfigs.stream()
                 .collect(Collectors.toMap(AdminCompanyWechatPayConfig::getId, Function.identity()));
 
         final Map<String, List<AdminWebsitPayConfig>> itemMap = payConfigList.stream()
                 .collect(Collectors.groupingBy(AdminWebsitPayConfig::getWebsitId));
 
+        final Map<String, SysDictCompany> steadUnitMap = steadUnitList.stream()
+                .collect(Collectors.toMap(SysDictCompany::getDictCode, Function.identity()));
+
         // 计算出最多行配置数量
         int configCount = 0;
         for (Map.Entry<String, List<AdminWebsitPayConfig>> entry : itemMap.entrySet()) {
@@ -1067,12 +1090,28 @@ public class AdminWebsitLogic {
             List<Object> row = new ArrayList<>();
 
             final AdminCompanyWechatPayConfig wechatPayConfig = wechatPayConfigMap.get(websit.getPayWorkerCodeId());
+            final AdminCompanyWechatPayConfig insurePayConfig = wechatPayConfigMap.get(websit.getPayInsureCodeId());
+            final SysDictCompany steadUnit = steadUnitMap.get(websit.getInsureSteadUnit());
+            row.add(websit.getBelongCompany());
             row.add(websit.getWebsitId());
             row.add(websit.getName());
+            row.add(BaseEnum.keyToEnumNotNull(WebsitAttrEnum.class, websit.getAttr()).getRemark());
+            row.add(websit.getLevel() == 1 ? "一级网点" : "二级网点");
+            row.add(websit.getLegalName());
+            row.add(websit.getLegalMobile());
+            row.add(websit.getLegalIdCard());
             row.add(websit.getLinkName());
+            row.add(websit.getLinkMobile());
             row.add(websit.getAddress());
-            row.add(Objects.nonNull(wechatPayConfig) ? wechatPayConfig.getPayMerchantName() : "无");
+            row.add(Objects.nonNull(wechatPayConfig) ? wechatPayConfig.getPayMerchantName() : "");
+            row.add(websit.getInsureType());
+            row.add(Objects.nonNull(insurePayConfig) ? insurePayConfig.getPayMerchantName() : "");
+            row.add(Objects.nonNull(steadUnit) ? steadUnit.getDictValue() : "");
             row.add(websit.getStatus() ? "启用" : "禁用");
+            row.add(websit.getWebsitPhone());
+            row.add(websit.getOpenBank());
+            row.add(websit.getBankAccount());
+            row.add(websit.getEmail());
             row.add(websit.getIsUseAllinpay() ? "开启" : "关闭");
 
             final List<AdminWebsitPayConfig> items = itemMap.get(websit.getWebsitId());