fix 业务层次

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileController.java

@@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -22,11 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
  * 填写资料审核Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-12-20
  */
@@ -102,6 +104,20 @@ public class UserProfileStampController extends BaseController {
         bo.setTypeStatus(2L);
         List<UserProfileExportGaiVo> list = iUserProfileService.exportPo(bo);
         ExcelUtil<UserProfileExportGaiVo> util = new ExcelUtil<UserProfileExportGaiVo>(UserProfileExportGaiVo.class);
-        return util.exportExcel(list, "填写盖章审核");
+        String fileName = "";
+        if(bo.getStatus().get(0)==0){
+            fileName="全部";
+        }
+        if(bo.getStatus().get(0)==1){
+            fileName="通过";
+        }
+        if(bo.getStatus().get(0)==2){
+            fileName="待审";
+        }
+        if(bo.getStatus().get(0)==3){
+            fileName="不通过";
+        }
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return util.exportExcel(list, "填写盖章审核-"+fileName+"-学员数据-"+timeStr);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -28,8 +28,10 @@ import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.*;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -68,6 +70,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private IOrderGoodsService iOrderGoodsService;
 
+
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
@@ -320,7 +323,30 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 throw new CustomException("该商品已被购买过，无法改变状态");
             }
         }
-        if(entity.getGoodsType().longValue()==1&&entity.getGoodsId().longValue()>0){
+        if(entity.getGoodsType().longValue()==1&&Validator.isNotEmpty(entity.getStudyCount())&&entity.getGoodsId().longValue()>0){
+            //判断学习次数有没有变化
+            GoodsVo old = this.queryById(entity.getGoodsId());
+            if(Validator.isEmpty(old.getStudyCount())){
+                old.setStudyCount(0L);
+            }
+            if(entity.getStudyCount().longValue()>old.getStudyCount().longValue()){
+                Long addNum = entity.getStudyCount() - old.getStudyCount();
+                //增加购买用户的学习次数
+                OrderGoodsQueryBo bo = new OrderGoodsQueryBo();
+                bo.setGoodsId(entity.getGoodsId());
+                List<OrderGoodsVo> goodsList = iOrderGoodsService.queryList(bo);
+                for(OrderGoodsVo vo : goodsList){
+                    //增加学习次数
+                    OrderGoods orderGoods = new OrderGoods();
+                    orderGoods.setOrderGoodsId(vo.getOrderGoodsId());
+                    orderGoods.setStudyCount(vo.getStudyCount()+addNum);
+                    orderGoods.setUpdateTime(DateUtils.getNowTime());
+                    iOrderGoodsService.updateById(orderGoods);
+                }
+            }
+            if(entity.getStudyCount().longValue()<old.getStudyCount().longValue()){
+                throw new CustomException("学习次数不允许变小");
+            }
 
         }
     }