fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -171,6 +171,7 @@ public class CommonController extends BaseController {
     @Autowired
     private ClassGradeUserMapper classGradeUserMapper;
 
+
     @Autowired
     private IMajorService iMajorService;
     private IZsBankService iZsBankService;
@@ -841,14 +842,11 @@ public class CommonController extends BaseController {
         return AjaxResult.success();
     }
 
-    @ApiOperation("七大员推送权限结果回调")
+    @ApiOperation("批量生成证书")
     @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @PostMapping("/common/free/sevenPushAuthCallBack")
-    public AjaxResult sevenPushAuthCallBack(@RequestBody SevenPushAuthAddBo bo) {
-        ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", "867735392558919680");
-        if (!ToolsUtils.checkSignCwSnFromOldSys(bo.getGradeUserId().toString(), bo.getStamp().toString(), bo.getSign())) {
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success("成功", iClassGradeUserService.sevenPushAuthCallBack(bo) ? 1 : 0);
+    @PostMapping("/common/free/makeBatchCertificatePhoto")
+    public AjaxResult makeBatchCertificatePhoto(@RequestBody ClassGradeUserQueryBo bo) {
+        iCertificateTpService.makeBatchCertificatePhoto(bo);
+        return AjaxResult.success();
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -44,6 +45,8 @@ import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.impl.ClassGradeServiceImpl;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
 import com.zhongzheng.modules.user.bo.UserCertificateAddBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
@@ -110,6 +113,10 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
 
     @Autowired
     private ICourseModuleService iCourseModuleService;
+
+    @Autowired
+    private IOrderGoodsService iOrderGoodsService;
+
     @Autowired
     private IMajorService iMajorService;
     @Value("${certificate.host}")
@@ -190,6 +197,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
                 .eq(UserCertificate::getUserId, bo.getUserId())
                 .eq(UserCertificate::getGradeId,bo.getGradeId()).last("limit 1"));
         if(Validator.isNotEmpty(userCertificate)){
+            System.out.println("已存在证书");
             log.info("已存在证书" + bo.getUserId()+"-"+bo.getGradeId(), "");
             return null;
         }
@@ -281,9 +289,18 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     @Override
     public String makeBatchCertificatePhoto(ClassGradeUserQueryBo bo) {
         List<ClassGradeUser> list = iClassGradeUserService.list(new LambdaQueryWrapper<ClassGradeUser>()
-                .eq(ClassGradeUser::getPeriodStatus, 1).ge(ClassGradeUser::getCreateTime,bo.getCreateTime()));
+                .eq(ClassGradeUser::getPeriodStatus, 1).ge(ClassGradeUser::getCreateTime,bo.getClassStartTime()));
         for(ClassGradeUser gradeUser : list){
-            
+            ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
+            queryBo.setGradeId(gradeUser.getGradeId());
+            queryBo.setUserId(gradeUser.getUserId());
+            queryBo.setOrderGoodsId(gradeUser.getOrderGoodsId());
+            OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>()
+                    .eq(OrderGoods::getOrderGoodsId, gradeUser.getOrderGoodsId()));
+            queryBo.setGoodsId(orderGoods.getGoodsId());
+            System.out.println("生成证书");
+            System.out.println(JSON.toJSONString(queryBo));
+            makeCertificatePhoto(queryBo);
         }
         return null;
     }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="businessId != null and businessId != ''">
             AND ar.business_id = #{businessId}
         </if>
+        order by ar.sort
     </select>
 
     <select id="getDetail" parameterType="com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo" resultMap="ActivityRecommendVoResult">