fix

run-prod.sh

@@ -32,7 +32,4 @@ docker run -p 5055:5055 --name ${app_name} \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
+

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -256,6 +256,7 @@ public class CourseController extends BaseController {
                 vo.setUserId(user.getUserId());
                 vo.setGoodsId(queryBo.getGoodsId());
                 vo.setTelphone(queryBo.getTelphone());
+                vo.setIdCard(queryBo.getIdCard());
                 if (StringUtils.isNotBlank(user.getPasswordAes())){
                     vo.setPasswordAes(EncryptHandler.decrypt(user.getPasswordAes()));
                 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -2039,7 +2039,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         HashMap<String, String> map = new HashMap<>();
         map.put("TenantId", tenantId);
-        HttpUtils.sendPostJsonHeader(RECORD_DOWNLOAD, JSONObject.toJSONString(bo),map);
+       HttpUtils.sendPostJsonHeader(RECORD_DOWNLOAD, JSONObject.toJSONString(bo), map);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/GoodsBatchListVo.java

@@ -15,6 +15,8 @@ public class GoodsBatchListVo implements Serializable {
 
     private String telphone;
 
+    private String idCard;
+
     private Long goodsId;
 
     private Long userId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -943,16 +943,17 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return classGradeStudentVos;
     }
 
+
     @Override
     public HashMap<String, Object> getPlush(ClassGradeUserQueryBo bo) {
         HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-        if (ObjectUtils.isNotEmpty(bo.getPeriodPlush()) && bo.getPeriodPlush() != 1) {
+        if (ObjectUtils.isNotEmpty(bo.getOfficialStatus()) && bo.getOfficialStatus() != 1) {
             Integer notPlush = this.baseMapper.getPlush(bo);
             stringObjectHashMap.put("notPlush", notPlush);
             stringObjectHashMap.put("plush", 0);
         } else {
             Integer allPlush = this.baseMapper.getPlush(bo);
-            bo.setPeriodPlush(1);
+            bo.setOfficialStatus(1);
             Integer plush = this.baseMapper.getPlush(bo);
             stringObjectHashMap.put("plush", plush);
             stringObjectHashMap.put("notPlush", allPlush - plush);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputQueryBo.java

@@ -77,4 +77,5 @@ public class OrderInputQueryBo extends BaseEntity {
 	/** 录单来源 1普通录单 2新B端下单  3旧B端下单 */
 	@ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
 	private Integer inputFrom;
+	private List<String> inputOrderSns;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputServiceImpl.java

@@ -283,24 +283,39 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         updateById(orderInput);
     }
 
+
     @Override
     public Map<String, Object> excelImport(List<String> ids) {
         Map<String, Object> map = new HashMap<>();
-        List<OrderInputVo> orderInputVos = new ArrayList<>();
         List<OrderInputImpotVo> orderInputImpotVos = new ArrayList<>();
         List<OrderListImportVo> orderListImportVos = new ArrayList<>();
-        if (ids.size() > 50) {
+        List<OrderListImportVo> orderListImportlist = new ArrayList<>();
+        if (ids.size() > 500) {
             throw new CustomException("超出文档导出上限");
         }
         if (ObjectUtils.isNotEmpty(ids)) {
             final Integer[] number = {Constants.NUMBER};
-            ids.forEach(id -> {
-                OrderInputQueryBo orderInputQueryBo = new OrderInputQueryBo();
-                orderInputQueryBo.setInputOrderSn(String.valueOf(id));
-                OrderInputVo orderInputVo = this.selectList(orderInputQueryBo).get(0);
-                orderInputVos.add(orderInputVo);
+            OrderInputQueryBo orderInputQueryBo = new OrderInputQueryBo();
+            orderInputQueryBo.setInputOrderSns(ids);
+            List<OrderInputVo> orderInputVos = this.selectList(orderInputQueryBo);
+            orderInputVos.forEach(item -> {
+                OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
+                bean.setId(number[0]);
+                if (ObjectUtils.isEmpty(item.getGoodsRealPrice())) {
+                    bean.setGoodsRealPrice(BigDecimal.valueOf(0));
+                }
+                if (!ObjectUtils.isEmpty(item.getOrderFrom())){
+                    bean.setInputFrom(getGoodFromName(item.getOrderFrom()));
+                }
+                bean.setGoodBusiness(item.getEducationName() + item.getProjectName() + item.getBusinessName());
+                bean.setGoodsNoReceived(item.getPayPrice().subtract(item.getGoodsReceived()));
+                bean.setCreateTime(DateUtils.timestampToDateFormat(item.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+                orderInputImpotVos.add(bean);
+                number[0]++;
+            });
+            orderInputVos.forEach(orderInputVo -> {
                 OrderQueryBo orderQueryBo = new OrderQueryBo();
-                orderQueryBo.setInputOrderSn(String.valueOf(id));
+                orderQueryBo.setInputOrderSn(String.valueOf(orderInputVo.getInputOrderSn()));
                 orderQueryBo.setStatus(new Integer[]{1});
                 List<OrderListVo> orderListVo = iOrderService.selectList(orderQueryBo);
                 orderListVo.forEach(orderLIst -> {
@@ -308,9 +323,9 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     if (ObjectUtils.isEmpty(orderLIst.getGoodsRealPrice())) {
                         bean.setGoodsRealPrice(BigDecimal.valueOf(0));
                     }
-                    bean.setId(number[0]);
                     bean.setGoodsPayStatus(getGoodsPayStatus(orderLIst.getGoodsPayStatus()));
-                    bean.setInputOrderSn(id);
+                    bean.setInputOrderSn(orderInputVo.getInputOrderSn());
+                    bean.setCreateTime(DateUtils.timestampToDateFormat(orderLIst.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                     bean.setGoodsBusiness(orderLIst.getEducationName() + orderLIst.getProjectName() + orderLIst.getBusinessName());
                     bean.setOrderStatus(getOrderStatus(orderLIst.getOrderStatus()));
                     bean.setRefundStatus(getRefundStatus(orderLIst.getRefundStatus()));
@@ -322,27 +337,17 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     }
                     bean.setGoodsNotReceived(orderLIst.getPayPrice().subtract(orderLIst.getGoodsReceived()));
                     orderListImportVos.add(bean);
-                    number[0]++;
                 });
             });
+            final Integer[] number1 = {Constants.NUMBER};
+            orderListImportVos.forEach(item->{
+                item.setId(number1[0]);
+                orderListImportlist.add(item);
+                number1[0]++;
+            });
         }else {
             throw new CustomException("请先勾选数据");
         }
-        final Integer[] number = {Constants.NUMBER};
-        orderInputVos.forEach(item -> {
-            OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
-            bean.setId(number[0]);
-            if (ObjectUtils.isEmpty(item.getGoodsRealPrice())) {
-                bean.setGoodsRealPrice(BigDecimal.valueOf(0));
-            }
-            if (!ObjectUtils.isEmpty(item.getOrderFrom())){
-                bean.setInputFrom(getGoodFromName(item.getOrderFrom()));
-            }
-            bean.setGoodBusiness(item.getEducationName() + item.getProjectName() + item.getBusinessName());
-            bean.setGoodsNoReceived(item.getPayPrice().subtract(item.getGoodsReceived()));
-            orderInputImpotVos.add(bean);
-            number[0]++;
-        });
         List<Map<String, Object>> sheetsList = new ArrayList<>();
         ExportParams deptExportParams = new ExportParams();
         deptExportParams.setSheetName("后台订单");
@@ -358,7 +363,7 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         deptExportMap1.put("title", deptExportParams1);
         deptExportMap1.put("entity", OrderListImportVo.class);
         // sheet中要填充得数据
-        deptExportMap1.put("data", orderListImportVos);
+        deptExportMap1.put("data", orderListImportlist);
         sheetsList.add(deptExportMap);
         sheetsList.add(deptExportMap1);
         OutputStream out = null;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -1798,7 +1798,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             if(Validator.isEmpty(bo.getSimilarity())){
                 throw new CustomException("相似度缺失");
             }
-            if(bo.getSimilarity()<80){
+            if(bo.getSimilarity()<65){
                 throw new CustomException("相似度不达标");
             }
             UserStudyRecordPhotoAddBo userStudyRecordPhotoAddBo = new UserStudyRecordPhotoAddBo();

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -2287,6 +2287,7 @@
         FROM
             class_grade_user cgu
                 LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+                LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
                 LEFT JOIN goods g ON og.goods_id = g.goods_id
                 LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
                 LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
@@ -2300,6 +2301,8 @@
 	            AND og.pay_status IN ( 2, 3, 4 )
 	            AND cgu.period_status != 1
 	            AND cgu.finish_status = 0
+                AND cg.class_start_time <= UNIX_TIMESTAMP(NOW())
+                AND cg.class_end_time >= UNIX_TIMESTAMP(NOW())
 	            AND (
 	            SELECT
 	            	COUNT( usr.record_id )

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInputMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
-        SELECT  u.input_order_sn,
+        SELECT u.input_order_sn,
         u.order_from,
         any_value (u.old_order_sn ) old_order_sn,
         any_value(g.goods_type) goods_type,
@@ -62,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         any_value ( cet.education_name ) education_name,
         any_value ( cpt.project_name ) project_name,
         any_value ( cb.business_name ) business_name,
-        (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = u.input_order_sn and og.refund_status = 2) goods_refund,
+        (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn
+        where o.input_order_sn = u.input_order_sn and og.refund_status = 2) goods_refund,
         IFNULL(sum( og.goods_received ),0) goods_received,
         IFNULL(sum(og.goods_price ),0) order_price,
         IFNULL(sum(og.goods_real_price),0) pay_price,
@@ -82,11 +83,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND o.order_from = #{orderFrom}
         </if>
         <if test="businessId != null and businessId != ''">
-        AND oi.business_id = #{businessId}
+            AND oi.business_id = #{businessId}
         </if>
         <if test="inputOrderSn != null and inputOrderSn != ''">
             AND oi.input_order_sn = #{inputOrderSn}
         </if>
+        <if test="inputOrderSns != null and inputOrderSns.size()!=0">
+            AND oi.input_order_sn in
+            <foreach collection="inputOrderSns" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="educationTypeId != null and educationTypeId != ''">
             AND oi.education_type_id = #{educationTypeId}
         </if>
@@ -94,7 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND oi.old_order_sn = #{oldOrderSn}
         </if>
         <if test="searchKey != null and searchKey != ''">
-            AND (oi.create_username like concat('%', #{searchKey}, '%') or oi.input_order_sn = #{searchKey} or (select count(*) from `user` us where us.user_id = o.user_id AND us.realname like concat('%', #{searchKey}, '%') )>0)
+            AND (oi.create_username like concat('%', #{searchKey}, '%') or oi.input_order_sn = #{searchKey} or (select
+            count(*) from `user` us where us.user_id = o.user_id AND us.realname like concat('%', #{searchKey}, '%')
+            )>0)
         </if>
         <if test="startTime != null and startTime != ''">
             AND oi.create_time >= #{startTime}