Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -3620,6 +3620,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     @Override
     public String getTopicList(String topParam) {
+        log.error("参数:"+topParam);
+        String s = HttpUtils.sendGet(QUESTION_DETAIL, topParam);
+        log.error("结果:"+s);
         return HttpUtils.sendGet(QUESTION_DETAIL, topParam);
     }
 

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

@@ -173,6 +173,9 @@ public class OrderListVo {
     @ApiModelProperty("手机号码")
     private String telphone;
 
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
     @Excel(name = "商品订单状态")
     @ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
     private Integer orderGoodsStatus;

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

@@ -181,7 +181,12 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             if(checkLog.getCheckStatus()!=2&&checkLog.getCheckStatus()!=5){
                 throw new CustomException("非待支付状态");
             }
-
+            TopOrderBankPay orderBankPay = getOne(new LambdaQueryWrapper<TopOrderBankPay>()
+                    .eq(TopOrderBankPay::getType, bo.getType())
+                    .eq(TopOrderBankPay::getOrderSn, bo.getOrderSn()).ne(TopOrderBankPay::getResultStatus, -1).last("limit 1"));
+            if(Validator.isNotEmpty(orderBankPay)){
+                throw new CustomException("已提交支付");
+            }
             TopSysRole sysRole = iTopSysRoleService.getOne(new LambdaQueryWrapper<TopSysRole>()
                     .eq(TopSysRole::getRoleName, "出纳")
                     .eq(TopSysRole::getStatus, 1).last("limit 1"));
@@ -216,6 +221,9 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             BigDecimal money = null;
             money =order.getBrokerage();
             add.setMoney(money);
+            if(add.getPayType()==4){
+                add.setResultStatus(1);
+            }
             //网银支付
             if(add.getPayType()==5){
                 Map<String, String> params = new HashMap<>();
@@ -306,6 +314,12 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             if (!roleIds.contains(sysRole.getRoleId()) && !bo.getLoginName().equals("admin") ) {
                 throw new CustomException("当前账号没有审核权限");
             }
+            TopOrderBankPay orderBankPay = getOne(new LambdaQueryWrapper<TopOrderBankPay>()
+                    .eq(TopOrderBankPay::getType, bo.getType())
+                    .eq(TopOrderBankPay::getDivideLogId, bo.getDivideLogId()).ne(TopOrderBankPay::getResultStatus, -1).last("limit 1"));
+            if(Validator.isNotEmpty(orderBankPay)){
+                throw new CustomException("已提交支付");
+            }
         /*if (!roleIds.contains(checkLog.getRoleId()) && !bo.getLoginName().equals("admin") ) {
             throw new CustomException("当前账号没有审核权限");
         }*/

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

@@ -2152,6 +2152,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                         item.setSex("女");
                     }
                 }
+                if (ObjectUtils.isNotNull(vo.getApplySiteExamTime())){
+                    String format = String.format("%s %s-%s", DateUtils.timestampToDateFormat(vo.getApplySiteExamTime()), "yyyy-MM-dd", vo.getApplySiteStartTime(), vo.getApplySiteEndTime());
+                    item.setApplyTime(format);
+                }
+                if (ObjectUtils.isNotNull(vo.getSubscribeId())){
+                    UserSubscribe subscribe = getById(vo.getSubscribeId());
+                    Goods goods = iGoodsService.getById(subscribe.getGoodsId());
+                    if (ObjectUtils.isNotNull(goods.getMajorId())){
+                        Major major = iMajorService.getById(goods.getMajorId());
+                        item.setMajorName(major.getCategoryName());
+                    }
+                }
                 list1.add(item);
 
                 if(Validator.isNotEmpty(vo.getIdCardImg1())){

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeStudentExportVo.java

@@ -43,6 +43,13 @@ public class UserSubscribeStudentExportVo {
 	@ApiModelProperty("工作单位")
 	private String companyName;
 
+	@Excel(name = "约考时间")
+	@ApiModelProperty("约考时间")
+	private String applyTime;
+
+	@Excel(name = "所报专业")
+	@ApiModelProperty("所报专业")
+	private String majorName;
 
 	@Excel(name = "岗位")
 	@ApiModelProperty("岗位")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -307,6 +307,14 @@ public class UserVo {
 	private String school;
 	@ApiModelProperty("毕业时间")
 	private String graduationTime;
+	@ApiModelProperty("考试时间")
+	private Long applySiteExamTime;
+	@ApiModelProperty("考试时间")
+	private String applySiteStartTime;
+	@ApiModelProperty("考试时间")
+	private String applySiteEndTime;
+	@ApiModelProperty("预约ID")
+	private Long subscribeId;
 
 	public void setNull(){
 		this.setOpenId(null);

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

@@ -24,10 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DISTINCT ep.paper_id,
             ep.paper_name
         FROM
-            exam e
-                LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
-        WHERE
-                e.exam_id IN (
+            (
                 SELECT
                     exam_id
                 FROM
@@ -40,16 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                     concat(
                                             IFNULL(( SELECT GROUP_CONCAT( major_id ) eids FROM goods_attached WHERE goods_id = #{goodsId} AND type = 2 ), '' ),
                                             ',',
-                                            IFNULL(
-                                                    (
-                                                        SELECT
-                                                            GROUP_CONCAT( chapter_exam_id ) eids2
-                                                        FROM
-                                                            question_module_chapter
-                                                        WHERE
-                                                                module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )),
-                                                    ''
-                                                )))) UNION
+                                            IFNULL(( SELECT GROUP_CONCAT( chapter_exam_id ) eids2 FROM question_module_chapter WHERE module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )), '' ))))
+                UNION
                 SELECT
                     major_id AS exam_id
                 FROM
@@ -57,8 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHERE
                     goods_id = #{goodsId}
                   AND type = 3
-            )
-          AND e.exam_paper_id IS NOT NULL AND ep.`status` != -1
+            ) a
+                LEFT JOIN exam e ON a.exam_id = e.exam_id
+            exam e
+                LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE
+            e.exam_paper_id IS NOT NULL AND ep.`status` != -1
     </select>
 
     <select id="getGoodsExamPaperByGoodsIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">

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

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="telphone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="realname" column="realname"/>
+        <result property="companyName" column="company_name"/>
 
         <result property="goodsReceived" column="goods_received"/>
         <result property="refundStatus" column="refund_status"/>
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             u.telphone,
             u.realname,
             u.id_card,
+            u.company_name,
             cet.education_name,
             cpt.project_name,
             cb.business_name,

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -292,9 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND v.tenant_id = #{tenantId}
         </if>
-        <if test="payStatus != null and payStatus.size()!=0">
-            AND cl.pay_status in
-            <foreach collection="payStatus" item="item" index="index" open="(" close=")" separator=",">
+        <if test="checkStatus != null and checkStatus.size()!=0">
+            AND cl.check_status in
+            <foreach collection="checkStatus" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -346,6 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND bcl.order_sn = v.order_sn)>0
         </if>
+        order by v.create_time
     </select>
 
     <select id="getMonthCreditWaitCount" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="Long">

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -813,14 +813,11 @@
         ( SELECT m.category_name FROM major m WHERE   m.id =g.major_id LIMIT 1) AS category_name,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id LIMIT 1) AS business_name,
         ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id LIMIT 1) AS project_name,
-        s.service_start_time,
-        s.service_end_time,
-        ( SELECT count(*) FROM course_file cf WHERE  cf.handouts_id =g.handouts_id AND cf.type = 1 AND cf.`status` = 1 ) AS file_num,
+        ( SELECT count(*) FROM course_file cf WHERE  cf.handouts_id =g.handouts_id AND cf.type = 1 AND cf.`status` = 1 ) AS file_num
         FROM
         goods g
         LEFT JOIN order_goods s ON g.goods_id = s.goods_id
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
-        WHERE
         where 1=1
         AND s.refund_status in (0,1,3)
         AND s.pay_status in (2,3,4)
@@ -921,14 +918,11 @@
         gc.goods_id = g.goods_id
         AND cm.type = 1)) as section_num,
         (SELECT COUNT(DISTINCT section_id) FROM user_study_record r where r.order_goods_id=s.order_goods_id  AND r.current_status = 1)
-        as stu_all_num,
-        s.service_start_time,
-        s.service_end_time
+        as stu_all_num
         FROM
         goods g
         LEFT JOIN order_goods s ON g.goods_id = s.goods_id
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
-        WHERE
         where 1=1
         AND s.refund_status in (0,1,3)
         AND s.pay_status in (2,3,4)

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -122,6 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCardImg1" column="id_card_img1"/>
         <result property="idCardImg2" column="id_card_img2"/>
         <result property="keyValue" column="key_value"/>
+        <result property="applySiteExamTime" column="apply_site_exam_time"/>
+        <result property="applySiteStartTime" column="apply_site_start_time"/>
+        <result property="applySiteEndTime" column="apply_site_end_time"/>
+        <result property="subscribeId" column="subscribe_id"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">