fix

coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java

@@ -1,6 +1,7 @@
 package com.cool.store.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 
 import java.util.Date;
 import javax.persistence.*;
@@ -87,6 +88,17 @@ public class ShopAuditInfoDO {
     @ApiModelProperty("数据类型 0-提交 1-审批")
     private Integer dataType;
 
+    @ApiModelProperty("头像")
+    private String avatar = "https://oss-store.coolcollege.cn/eid/e17cd2dc350541df8a8b0af9bd27f77d/2404/53308197437354940.png";
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     /**
      * @return id
      */

coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java

@@ -99,6 +99,8 @@ public class SystemBuildingShopDO {
     private Date createTime;
     @Column(name = "update_time")
     private Date updateTime;
+    @Column(name = "store_name")
+    private String storeName;
 
 
 
@@ -172,6 +174,7 @@ public class SystemBuildingShopDO {
         systemBuildingShopDO.setRegioGeneral(sysStoreAppRequest.getSupervisorDetail().getRegioGeneral());
         // regioGeneralId
         systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId());
+        systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName());
         return systemBuildingShopDO;
     }
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java

@@ -6,6 +6,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.RegionDao;
 import com.cool.store.dao.ShopStageInfoDAO;
+import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.LicenseTransactDO;
 import com.cool.store.entity.ShopAuditInfoDO;
 import com.cool.store.enums.AuditTypeEnum;
@@ -13,6 +14,7 @@ import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.ApplyLicenseMapper;
+import com.cool.store.mapper.EnterpriseUserMapper;
 import com.cool.store.mapper.ShopAuditInfoMapper;
 import com.cool.store.request.LicenseListRequest;
 import com.cool.store.request.SubmitLicenseRequest;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -53,6 +56,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
     @Resource
     ShopStageInfoDAO shopStageInfoDAO;
 
+    @Resource
+    EnterpriseUserMapper userMapper;
+
     @Override
     public Boolean submitLicense(SubmitLicenseRequest request) {
         log.info("submitLicense request：{}", JSONObject.toJSONString(request));
@@ -91,6 +97,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         }
         SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result);
         List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
+        List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
+        List<EnterpriseUserDO> userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
+        Map<String, String> userAvatarMap = userInfoByUserIds.stream().collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
+        listByShopIdAndType.stream().forEach( item -> {
+            item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
+        });
         submitLicenseResponse.setProcessRecords(listByShopIdAndType);
         return submitLicenseResponse;
     }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java

@@ -170,6 +170,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
             franInfo.setInviteUserId(systemBuildingShopDO.getStoreInviteesId());
             storeDetail.setStoreNature(systemBuildingShopDO.getStoreNature());
             storeDetail.setStoreOperator(systemBuildingShopDO.getStoreOperator());
+            storeDetail.setStoreName(systemBuildingShopDO.getStoreName());
             // bigDesc
             storeDetail.setBigDesc(systemBuildingShopDO.getBigDesc());
             // fightDesc
@@ -238,6 +239,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
             storeDetail.setDistrict(pointInfoDO.getDistrict());
             storeDetail.setTownship(pointInfoDO.getTownship());
             storeDetail.setDetailAddress(pointInfoDO.getAddress());
+            storeDetail.setStoreName(pointInfoDO.getPointName());
 
         }
         sysStoreAppResponse.setStoreDetail(storeDetail);

coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java

@@ -58,7 +58,8 @@ public class SignValidateFilter implements Filter {
                     "/**/webjars/**",
                     "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
                     "/xfsg/*/api/audit/result",
-                    "/xfsg/mini/line/getRegionPayPic"
+                    "/xfsg/mini/line/getRegionPayPic",
+                    "/xfsg/mini/**"
 
             );