fix

run-prod.sh

@@ -1,5 +1,3 @@
-
-
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhongzheng'
@@ -34,3 +32,6 @@ docker run \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
+
+
+

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -5,6 +5,7 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.framework.web.service.AsyncService;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.order.service.IOrderHandleService;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.schedule.service.IScheduleService;
@@ -46,6 +47,8 @@ public class ScheduleController extends BaseController {
 
     private final IOrderHandleService iOrderHandleService;
 
+    private final IClassGradeUserService iClassGradeUserService;
+
     /**
      * 商品购买发送消息
      * @return
@@ -475,4 +478,11 @@ public class ScheduleController extends BaseController {
         iOrderHandleService.overTimeCloseOrder();
         return AjaxResult.success();
     }
+
+    @ApiOperation("七大员重推")
+    @GetMapping("/seven/resetQdyCheckInfo")
+    public AjaxResult resetQdyCheckInfo(){
+        iClassGradeUserService.resetQdyCheckInfo();
+        return AjaxResult.success();
+    }
 }

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

@@ -233,6 +233,18 @@ public class ToolsUtils {
         return checktext != null ? checktext.equals(signature.toUpperCase()) : false;
     }
 
+
+    public static String removeAllTrim(String content) {
+        if(Validator.isNotEmpty(content)){
+            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+            Matcher m = p.matcher(content);
+            content = m.replaceAll("");
+            content = content.replaceAll(" ", "");
+            content = content.replaceAll("[\\u3000-\\u303F\\s\\u00A0]","");
+        }
+        return content;
+    }
+
     /**
      * 将字节数组转化我16进制字符串
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -28,11 +30,17 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
 {
     private static final long serialVersionUID = -8970718410437077606L;
 
+    private static Logger log = LoggerFactory.getLogger(AuthenticationEntryPointImpl.class);
+
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
             throws IOException
     {
         int code = HttpStatus.HTTP_UNAUTHORIZED;
+        String tenantId = request.getHeader("TenantId");
+        String token = request.getHeader("AuthorizationToken");
+        log.error(String.format("token: %s",token));
+        log.error(String.format("tenantId: %s",tenantId));
         String msg = StrUtil.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
     }

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

@@ -310,6 +310,8 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("1单证书 2多证书")
 	private Integer moreCertificateStatus;
 
+	private String sevenPushReason;
 
-
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -117,6 +117,10 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     @InterceptorIgnore(tenantLine = "true")
     ClassGradeUser selectUserNoTenant(ClassGradeUserQueryBo bo);
 
+    @InterceptorIgnore(tenantLine = "true")
+    void updateListUserNoTenant(@Param("sevenPushReason") String sevenPushReason);
+
     List<Long> getFinishRequiredCourse(ClassGradeUserQueryBo bo);
 
+
 }

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

@@ -155,4 +155,6 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 	List<ClassPeriodStudentVo> listBKUserPeriod(ClassGradeUserQueryBo bo);
 
     List<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo);
+
+	boolean resetQdyCheckInfo();
 }

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

@@ -659,7 +659,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(userVo.getRealName()) || Validator.isEmpty(userVo.getIdCard()) || Validator.isEmpty(userVo.getTelPhone())) {
             return "用户信息缺失";
         }
-        userVo.setRealName(userVo.getRealName().replaceAll(" ", ""));
+        userVo.setRealName(ToolsUtils.removeAllTrim(userVo.getRealName()));
         if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
             return pushSevenOfficialInfo(bo,userVo,orderGoods,goods);
         }
@@ -937,6 +937,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
     }
 
+    @Override
+    public boolean resetQdyCheckInfo(){
+        this.baseMapper.updateListUserNoTenant("培训周期时间未到");
+        return true;
+    }
+
     @Override
     public ClassPeriodStudentVo DecryptOfficialInfo(ClassGradeDecryptQueryBo bo) {
         String pars;
@@ -1226,7 +1232,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             return "用户不存在";
         }
         if(Validator.isNotEmpty(userVo.getRealName())){
-            userVo.setRealName(userVo.getRealName().replaceAll(" ", ""));
+            userVo.setRealName(ToolsUtils.removeAllTrim(userVo.getRealName()));
         }
         if (Validator.isEmpty(userVo.getInterfacePushId())) {
             return "没开通信息推送";
@@ -1727,7 +1733,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     item.setScore(cVo.getScore());
                     newList.add(item);
                 }
-                ossService.zipPeopleDownload(vo, outStream);
+        //        ossService.zipPeopleDownload(vo, outStream);
             }
             outStream.close();
         } catch (IOException e) {

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

@@ -195,21 +195,19 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
             Long secLong = 0L;
             Long studyLong = 0L;
 
-            if (vo.getPayStatus() == 1) {
-                SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
-                subjectStudyRecordQueryBo.setGoodsId(vo.getGoodsId());
-                subjectStudyRecordQueryBo.setUserId(vo.getUserId());
-                subjectStudyRecordQueryBo.setGradeId(vo.getGradeId());
-                subjectStudyRecordQueryBo.setOrderGoodsId(vo.getOrderGoodsId());
-                List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
-                for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
-                    secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
-                    studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
+            SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+            subjectStudyRecordQueryBo.setGoodsId(vo.getGoodsId());
+            subjectStudyRecordQueryBo.setUserId(vo.getUserId());
+            subjectStudyRecordQueryBo.setGradeId(vo.getGradeId());
+            subjectStudyRecordQueryBo.setOrderGoodsId(vo.getOrderGoodsId());
+            List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
+                secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
+                studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
 
-                }
-                vo.setSecAllNum(secLong);
-                vo.setStuAllNum(studyLong);
             }
+            vo.setSecAllNum(secLong);
+            vo.setStuAllNum(studyLong);
             //退款
             OrderGoodsRefund refund = iOrderGoodsRefundService
                     .getOne(new LambdaQueryWrapper<OrderGoodsRefund>()

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

@@ -918,7 +918,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setOrderType(Order.CONSUME_ORDER);
-        add.setOrderFrom(11);
         add.setHandleOrderSn(bo.getHandleOrderSn());
         if(orderHandle.getPayType()==1){
             add.setPayType(1);
@@ -1039,11 +1038,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         add.setOrderSn(out_trade_no);
-        if (Validator.isNotEmpty(bo.getOrderFrom()) && bo.getOrderFrom() == 6) {
-            add.setOrderFrom(bo.getOrderFrom());
-        } else {
-            add.setOrderFrom(Order.FROM_INPUT);
-        }
+        add.setOrderFrom(11);
         add.setPayPrice(payPrice);//需要支付价格
         add.setOrderPrice(totalPrice);//标准价格
         orderHandle.setPayPrice(orderHandle.getPayPrice().add(payPrice));

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -257,4 +257,7 @@ public class OrderListVo {
 
     @ApiModelProperty("服务有效期结束")
     private Long serviceEndTime;
+
+    @ApiModelProperty("经办人订单编号")
+    private String handleOrderSn;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -2213,21 +2213,23 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         List<OrderListVo> list = iOrderService.selectListApp(bo);
         for (OrderListVo orderVo : list) {
             if (orderVo.getCreateTime().longValue() < (new Long(DateUtils.getNowTime() - (24 * 3600))).longValue()) {
-                //超过24小时
-                Order order = new Order();
-                order.setOrderId(orderVo.getOrderId());
-                order.setOrderStatus(-2);
-                order.setUpdateTime(DateUtils.getNowTime());
-                order.setCancelTime(DateUtils.getNowTime());
-                iOrderService.updateById(order);
-                //关闭锁定班级
-                LambdaQueryWrapper<ClassGradeUserTemp> lqwLock = new LambdaQueryWrapper<>();
-                lqwLock.eq(ClassGradeUserTemp::getOrderSn, orderVo.getOrderSn());
-                ClassGradeUserTemp classGradeUserTemp = iClassGradeUserTempService.getOne(lqwLock);
-                if (classGradeUserTemp != null && classGradeUserTemp.getStatus() == ClassGradeUserTemp.STATUS_LOCK) {
-                    classGradeUserTemp.setStatus(ClassGradeUserTemp.STATUS_CLOSE); //
-                    classGradeUserTemp.setUpdateTime(DateUtils.getNowTime());
-                    iClassGradeUserTempService.updateById(classGradeUserTemp);//关闭锁定状态
+                if(Validator.isEmpty(orderVo.getHandleOrderSn())){
+                    //超过24小时
+                    Order order = new Order();
+                    order.setOrderId(orderVo.getOrderId());
+                    order.setOrderStatus(-2);
+                    order.setUpdateTime(DateUtils.getNowTime());
+                    order.setCancelTime(DateUtils.getNowTime());
+                    iOrderService.updateById(order);
+                    //关闭锁定班级
+                    LambdaQueryWrapper<ClassGradeUserTemp> lqwLock = new LambdaQueryWrapper<>();
+                    lqwLock.eq(ClassGradeUserTemp::getOrderSn, orderVo.getOrderSn());
+                    ClassGradeUserTemp classGradeUserTemp = iClassGradeUserTempService.getOne(lqwLock);
+                    if (classGradeUserTemp != null && classGradeUserTemp.getStatus() == ClassGradeUserTemp.STATUS_LOCK) {
+                        classGradeUserTemp.setStatus(ClassGradeUserTemp.STATUS_CLOSE); //
+                        classGradeUserTemp.setUpdateTime(DateUtils.getNowTime());
+                        iClassGradeUserTempService.updateById(classGradeUserTemp);//关闭锁定状态
+                    }
                 }
             }
         }

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

@@ -488,7 +488,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND cgu.official_status = 1
         </if>
         <if test="officialStatus != null and officialStatus == 0 ">
+<<<<<<< HEAD
             AND cgu.official_status != 1
+=======
+            AND (cgu.official_status is NULL or cgu.official_status=0)
+>>>>>>> master
         </if>
         <if test="realname != null and realname != ''">
             AND u.realname like concat('%', #{realname}, '%')

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

@@ -537,6 +537,9 @@
                 or cg.class_name like concat('%', #{searchKey}, '%')
                 or u.company_name like concat('%', #{searchKey}, '%'))
         </if>
+        <if test="inputOrderSn != null and inputOrderSn != '' ">
+            and (select count(*) from `oder` o where o.order_sn =og.order_sn and o.input_order_sn =  #{inputOrderSn})>0
+        </if>
         <if test="companyName != null and companyName != '' ">
             and u.company_name like concat('%', #{companyName}, '%')
         </if>
@@ -2162,7 +2165,16 @@
 
         WHERE
             1 = 1
-          AND g.id = #{id}
-
+        <if test="id != null ">
+            AND g.id = #{id}
+        </if>
+        <if test="sevenPushReason != null ">
+            AND g.seven_push_reason = #{sevenPushReason}
+        </if>
     </select>
+
+    <update id="updateListUserNoTenant" parameterType="map" >
+        UPDATE class_grade_user SET seven_push_check = 0 WHERE seven_push_check > 2 and
+            seven_push_reason = #{sevenPushReason}
+    </update>
 </mapper>

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

@@ -158,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderGoodsList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultMap="OrderHandleGoodsVoResult">
         SELECT
+<<<<<<< HEAD
             u.realname,
             u.id_card,
             u.telphone,
@@ -192,6 +193,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="refundStatus != null">
                 AND og.refund_status = #{refundStatus}
             </if>
+=======
+        u.realname,
+        u.id_card,
+        u.telphone,
+        g.goods_name,
+        g.`year`,
+        (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
+        og.goods_real_price,
+        og.order_goods_id,
+        o.user_id,
+        og.grade_id,
+        <if test="handleOrderSn != null">
+            oh.pay_status,
+        </if>
+        og.goods_id
+
+        FROM
+        `order` o
+        <if test="handleOrderSn != null">
+            LEFT JOIN order_handle oh ON o.handle_order_sn = oh.handle_order_sn
+        </if>
+        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        LEFT JOIN `user` u ON o.user_id = u.user_id
+        LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+        1=1
+        <if test="handleOrderSn != null">
+            AND o.handle_order_sn = #{handleOrderSn}
+        </if>
+        <if test="inputOrderSn != null">
+            AND o.input_order_sn = #{inputOrderSn}
+        </if>
+        <if test="refundStatus != null">
+            AND og.refund_status = #{refundStatus}
+        </if>
+>>>>>>> master
     </select>
 
     <select id="selectOverTimeOrderList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultType="com.zhongzheng.modules.order.vo.OrderHandleOverVo">

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

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="invoiceStatus" column="invoice_status"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="handleOrderSn" column="handle_order_sn"/>
     </resultMap>
 
     <select id="getGradePeriod" parameterType="Map" resultType="integer">