Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/mapper/WebAuditMapper.java

@@ -24,12 +24,15 @@ public interface WebAuditMapper  extends BaseMapper<WebAudit> {
             "    WHEN 5 THEN\n" +
             "    '活动' \n" +
             "    WHEN 6 THEN\n" +
-            "    '代金券' ELSE '未知类型' \n" +
+            "    '代金券' \n" +
+            "    WHEN 7 THEN\n" +
+            "    '经营许可证' ELSE '未知类型' \n" +
             "  END AS type,\n" +
             "  COUNT(*) AS typeSum \n" +
             "FROM\n" +
             "  web_audit \n" +
             "  where `status` = '0'\n" +
+            "  and `delete_flag` = '0'\n" +
             "GROUP BY\n" +
             "  type;")
     List<WebAuditVo> getAuditSum(QueryWrapper<WebAuditVo> queryWrapper);

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -10,14 +10,12 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.StoreBusinessInfo;
-import shop.alien.entity.store.StoreImg;
-import shop.alien.entity.store.StoreInfo;
-import shop.alien.entity.store.StoreInfoDraft;
+import shop.alien.entity.store.*;
 import shop.alien.entity.store.dto.StoreInfoDto;
 import shop.alien.entity.store.vo.*;
 import shop.alien.mapper.StoreImgMapper;
 import shop.alien.mapper.TagsMainMapper;
+import shop.alien.mapper.WebAuditMapper;
 import shop.alien.store.service.StoreInfoService;
 
 import java.io.IOException;
@@ -46,6 +44,8 @@ public class StoreInfoController {
 
     private final TagsMainMapper tagsMainMapper;
 
+    private final WebAuditMapper webAuditMapper;
+
     @ApiOperation("获取所有门店")
     @ApiOperationSupport(order = 1)
     @GetMapping("/getAll")
@@ -668,6 +668,12 @@ public class StoreInfoController {
         log.info("StoreInfoController.uploadfoodLicence?storeImg={}", storeImg);
         int num = storeInfoService.uploadfoodLicence(storeImg);
         if (num > 0) {
+            WebAudit webAudit = new WebAudit();
+            webAudit.setStoreInfoId(storeImg.getStoreId().toString());
+            webAudit.setType("7");
+            webAudit.setStatus("0");
+            webAudit.setContent("经营许可证");
+            webAuditMapper.insert(webAudit);
             return R.success("食品经营许可证图片添加成功");
         }
         return R.fail("食品经营许可证图片添加失败");
@@ -692,6 +698,12 @@ public class StoreInfoController {
                 storeInfo.setFoodLicenceStatus(storeInfoDto.getFoodLicenceStatus());
                 boolean flag = storeInfoService.updateById(storeInfo);
                 if (flag) {
+                    //待审核状态变为已审核
+                    WebAudit webAudit = webAuditMapper.selectOne(new LambdaQueryWrapper<WebAudit>().eq(WebAudit::getStoreInfoId,storeInfo.getId()).eq(WebAudit::getDeleteFlag,0).eq(WebAudit::getType,"7"));
+                    if(webAudit != null){
+                        webAudit.setStatus("1");
+                        webAuditMapper.updateById(webAudit);
+                    }
                     return R.success("拒绝审核成功");
                 } else {
                     return R.fail("拒绝审核失败");
@@ -701,7 +713,15 @@ public class StoreInfoController {
             storeInfo.setFoodLicenceStatus(storeInfoDto.getFoodLicenceStatus());
             boolean flag = storeInfoService.updateById(storeInfo);
             if (flag) {
-                storeInfoService.foodLicenceType(storeInfoDto.getId());
+                int num = storeInfoService.foodLicenceType(storeInfoDto.getId());
+                if(num > 0){
+                    //待审核状态变为已审核
+                    WebAudit webAudit = webAuditMapper.selectOne(new LambdaQueryWrapper<WebAudit>().eq(WebAudit::getStoreInfoId,storeInfo.getId()).eq(WebAudit::getDeleteFlag,0).eq(WebAudit::getType,"7"));
+                    if(webAudit != null){
+                        webAudit.setStatus("1");
+                        webAuditMapper.updateById(webAudit);
+                    }
+                }
                 return R.success("审核通过成功");
             }else{
                 return R.fail("审核失败");

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.store.*;
@@ -432,6 +433,13 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
 
     public List<LifeUserDynamicsVo> getDianZanList(String phoneId) {
         List<LifeUserDynamicsVo> lifeUserDynamicsVos = lifeUserDynamicsMapper.selectDianZanList(phoneId);
+        if (!CollectionUtils.isEmpty(lifeUserDynamicsVos)){
+            for (LifeUserDynamicsVo lifeUserDynamicsVo : lifeUserDynamicsVos) {
+                String phoneIdNew = lifeUserDynamicsVo.getPhoneId().substring(6);
+                StoreUser storeUser = storeUserService.getUserByPhone(phoneIdNew);
+                lifeUserDynamicsVo.setUserName(storeUser.getNickName());
+            }
+        }
         return  lifeUserDynamicsVos;
     }
 }

alien-store/src/main/java/shop/alien/store/service/impl/WebAuditServiceImpl.java

@@ -71,7 +71,9 @@ public class WebAuditServiceImpl extends ServiceImpl<WebAuditMapper, WebAudit> i
                 item.setType("活动");
             }else if ("6".equals(item.getType())) {
                 item.setType("代金券");
-            }  else {
+            } else if ("7".equals(item.getType())) {
+                item.setType("经营许可证");
+            } else {
                 item.setType("未知类型");
             }
         });