fix 二造

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

@@ -6,6 +6,7 @@ import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginBody;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.file.FileUploadUtils;
@@ -17,8 +18,11 @@ import com.zhongzheng.modules.course.vo.CourseMenuVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsJzsVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeBatchQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.bo.RollBackPeriodBo;
 import com.zhongzheng.modules.grade.bo.UserPeriodEditBo;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportAllVo;
 import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
@@ -78,6 +82,8 @@ public class CommonController
 
     @Autowired
     private IWxPayService iWxPayService;
+    @Autowired
+    private  IClassGradeService iClassGradeService;
 
     /**
      * 通用下载请求
@@ -194,8 +200,7 @@ public class CommonController
     @PostMapping("common/rollback/period")
     public AjaxResult<Void> rollbackPeriod(@RequestBody RollBackPeriodBo bo)
     {
-        String sign = bo.getStamp().toString()+"pubilc2022";
-        if(!bo.getSign().equals(ToolsUtils.EncoderByMd5(sign))){
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
             return AjaxResult.error("签名错误");
         }
         UserPeriodEditBo queryBo = new UserPeriodEditBo();
@@ -205,7 +210,28 @@ public class CommonController
         return AjaxResult.success();
     }
 
-   @ApiOperation("测试分班")
+    @ApiOperation("批量查询官方班级人数")
+    @PostMapping("common/batch/officialGradeCount")
+    public AjaxResult batchOfficialGradeCount(@RequestBody ClassGradeBatchQueryBo bo)
+    {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            return AjaxResult.error("签名错误");
+        }
+        String[] list = bo.getOfficialNameStr().split(",");
+        List<Map<String,Object>> numList = new ArrayList<>();
+        for(String officialName : list){
+            Map<String,Object> map = new HashMap<>();
+            ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
+            queryBo.setOfficialName(officialName);
+            map.put("officialName",officialName);
+            Integer num = iClassGradeService.queryOfficialGradeCount(queryBo);
+            map.put("num",num);
+            numList.add(map);
+        }
+        return AjaxResult.success(numList);
+    }
+
+    @ApiOperation("测试分班")
     @GetMapping("common/jzs/grade")
     public AjaxResult<Void> testGrade()
     {

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -3,6 +3,7 @@ package com.zhongzheng.common.utils;
 import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.aliyun.teaopenapi.models.Config;
+import com.zhongzheng.common.core.domain.AjaxResult;
 import io.micrometer.core.lang.NonNull;
 
 import java.io.*;
@@ -276,6 +277,14 @@ public class ToolsUtils {
         return result;
     }
 
+    public static Boolean checkSignFromOldSys(String stamp,String sign) {
+        String newSign = stamp+"pubilc2022";
+        if(!sign.equals(ToolsUtils.EncoderByMd5(newSign))){
+            return false;
+        }
+        return true;
+    }
+
     public static String EncoderByMd5(String str) {
         String result = "";
         MessageDigest md5 = null;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeBatchQueryBo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.grade.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 班级分页查询对象 class_grade
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("班级分页查询对象")
+public class ClassGradeBatchQueryBo extends BaseEntity {
+
+
+	@ApiModelProperty("当前时间戳")
+	@NotBlank(message = "当前时间戳不能为空")
+	private Long stamp;
+
+	@ApiModelProperty("签名")
+	@NotBlank(message = "签名不能为空")
+	private String sign;
+
+	/** 官方班级 */
+	@ApiModelProperty("官方班级数组")
+	private String officialNameStr;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -44,6 +44,8 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/** 官方班级 */
 	@ApiModelProperty("官方班级")
 	private String officialName;
+
+
 	/** 班级名称 */
 	@ApiModelProperty("班级名称")
 	private String className;

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -503,7 +503,6 @@ public class WxPayServiceImpl implements IWxPayService {
     public boolean shareToOldSys(Order order,List<OrderGoods> goodsList) {
         if (Validator.isNotEmpty(order)) {
             UserVo user = iUserService.queryById(order.getUserId());
-            if(Validator.isNotEmpty(user.getShareCode())){
                 OrderShareToOldVo vo  = new OrderShareToOldVo();
                 vo.setOrderId(order.getOrderId());
                 vo.setSharecode(user.getShareCode());
@@ -540,7 +539,6 @@ public class WxPayServiceImpl implements IWxPayService {
                     throw new CustomException("同步请求错误"+e.getMessage());
                 }
                 return true;
-            }
         }
         return false;
     }