fix

run-prod.sh

@@ -1,34 +1,5 @@
 #!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
+
 
 echo "开始等待20秒..."
 # 1-10秒内随机
@@ -58,6 +29,8 @@ docker run \
 -p 5030:5030 \
 --name ${app_admin_name} \
 --restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
@@ -96,6 +69,8 @@ docker run \
 -p 7077:7077 \
 --name ${app_admin_name} \
 --restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \

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

@@ -479,6 +479,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         sendAuidit(update);
         if (update.getStatus().equals(1)) {
             //审核通过同步身份证到用户信息
+   //         getUserPicInfo(update);
         }
         //审核承诺书发送消息
     //    sendAuiditSMS(update);

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

@@ -558,13 +558,16 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             return "班级商品不存在";
         }
         Long bmrq = 0L;
+        if (Validator.isEmpty(userVo.getClassStartTime())) {
+            return "班级开始时间缺失";
+        }
         if(userVo.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
             bmrq = orderGoods.getCreateTime();
         }else{
             bmrq = userVo.getClassStartTime();
         }
         if(Validator.isEmpty(userVo.getRealName())||Validator.isEmpty(userVo.getIdCard())||Validator.isEmpty(userVo.getTelPhone())){
-            throw new CustomException("用户信息缺失");
+            return "用户信息缺失";
         }
         Map<String, String> params = new HashMap<>();
         params.put("zh", OFFICIALPUSH_INFOACCOUNT);
@@ -1680,7 +1683,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setStatus(userPeriodStatusVo.getStatus());
                                     classPeriodSectionVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
                                     classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
-                                    classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                                    classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
+                                    if(Validator.isNotEmpty(photoList)&&photoList.size()>0){
+                                        classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                                    }
                                     if(startTotalTime==0L||startTotalTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
                                         startTotalTime = classPeriodSectionVo.getStudyStartTime();
                                     }
@@ -1828,7 +1834,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setStatus(userPeriodStatusVo.getStatus());
                         classPeriodSectionVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
                         classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
-                        classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                        classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
+                        if(Validator.isNotEmpty(photoList)&&photoList.size()>0){
+                            classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                        }
                         if(startTotalTime==0L||startTotalTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
                             startTotalTime = classPeriodSectionVo.getStudyStartTime();
                         }

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

@@ -1923,7 +1923,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void officialInfoPush(UserQueryBo bo) {
         List<ClassGradeUserGoodsVo> list = iClassGradeUserService.selectOfficialNotPush(bo);
         for (ClassGradeUserGoodsVo vo : list) {
-            UserConfirmInfo confirmInfo = iUserConfirmInfoService.getOne(new LambdaQueryWrapper<UserConfirmInfo>()
+           /* UserConfirmInfo confirmInfo = iUserConfirmInfoService.getOne(new LambdaQueryWrapper<UserConfirmInfo>()
                     .eq(UserConfirmInfo::getUserId, vo.getUserId()).eq(UserConfirmInfo::getOrderGoodsId, vo.getOrderGoodsId()
                     ).last("limit 1"));
             //有确认信息才允许推送
@@ -1932,7 +1932,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 queryBo.setGradeId(vo.getGradeId());
                 queryBo.setUserId(vo.getUserId());
                 String result = iClassGradeUserService.pushOfficialInfo(queryBo);
-            }
+            }*/
+            ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
+            queryBo.setGradeId(vo.getGradeId());
+            queryBo.setUserId(vo.getUserId());
+            String result = iClassGradeUserService.pushOfficialInfo(queryBo);
         }
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -113,5 +113,8 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	private List<TopBadBillTimeBo> badBillList;
 
+	@ApiModelProperty("C端订单过滤时间")
+	private Long filtrationTime = 1685449126L;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -390,14 +390,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             brokerage = bo.getPretaxBrokerage();
             add.setBrokerage(bo.getPretaxBrokerage().subtract(multiply));
         }
-
+        add.setRefundStatus(1);//退款状态：正常
+        add.setFinishStatus(0);//完单状态：未完单
         if (bo.getOrderFrom() == 3) {
             add.setCheckStatus(0);//待审核
         } else {
             add.setCheckStatus(1);//C端不需要审核
+            add.setFinishStatus(1);//C端自动完单
         }
-        add.setRefundStatus(1);//退款状态：正常
-        add.setFinishStatus(0);//完单状态：未完单
+
         //未收账款
         if (ObjectUtils.isNull(bo.getOrderReceived()) || bo.getOrderReceived().compareTo(new BigDecimal("0.00")) == 0) {
             add.setOrderUncollected(bo.getPayPrice());
@@ -1049,7 +1050,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             throw new CustomException("订单号有误！请检查");
         }
         //校验当前登入角色
-        List<TopSysUserRole> userRoles = topSysUserRoleService.list(new LambdaQueryWrapper<TopSysUserRole>().eq(TopSysUserRole::getUserId, bo.getOrderId()));
+        List<TopSysUserRole> userRoles = topSysUserRoleService.list(new LambdaQueryWrapper<TopSysUserRole>().eq(TopSysUserRole::getUserId, bo.getLoginId()));
         if (CollectionUtils.isEmpty(userRoles) && !"admin".equals(bo.getLoginName())) {
             throw new CustomException("当前账号没有审核权限");
         }
@@ -1119,20 +1120,35 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             //订单审核通过，账款已结清，满足完单条件
             //成本设置项
             TopOldOrder order = getById(oldOrder.getOrderId());
-            String costJson = order.getCostJson();
-            if (StringUtils.isNotBlank(costJson)) {
+
+            List<String> tenantIds = Arrays.asList("1", "867735392558919680");
+            if (tenantIds.contains(order.getTenantId())){
+                //祥粤云订单不算分成
+                order.setFinishStatus(1);//已完单
+                //修改订单分成
+                updateById(order);
+            }else {
                 //获取机构分成方式
                 SysTenant tenant = sysTenantService
                         .getOne(new LambdaQueryWrapper<SysTenant>()
                                 .eq(SysTenant::getTenantId, order.getTenantId()));
                 Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel()) ? tenant.getDivideModel() : 1;
-                //分成金额
-                TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
-                List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
-                if (CollectionUtils.isNotEmpty(itemList)) {
-                    //分成模板
-                    List<TopCostTpItemVo> divideList = itemList.stream().filter(x -> x.getItemCategory() == 1).collect(Collectors.toList());
-                    calculateDivide(divideList, order, divideModel);
+                String costJson = order.getCostJson();
+                if (StringUtils.isNotBlank(costJson)) {
+                    //分成金额
+                    TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
+                    List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
+                    if (CollectionUtils.isNotEmpty(itemList)) {
+                        //分成模板
+                        List<TopCostTpItemVo> divideList = itemList.stream().filter(x -> x.getItemCategory() == 1).collect(Collectors.toList());
+                        calculateDivide(divideList, order, divideModel);
+                    }
+                }else {
+                    order.setFinishStatus(1);//已完单
+                    order.setDivideModel(divideModel);
+                    order.setAccomplishTime(DateUtils.getNowTime());
+                    //修改订单分成
+                    updateById(order);
                 }
             }
         }
@@ -2363,6 +2379,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                 //已支付 不能撤销
                                 throw new CustomException(String.format("订单号分成已结清不能取消【%s】", orderSn));
                             }
+                            List<String> tenantIds = Arrays.asList("1", "867735392558919680");
+                            if (tenantIds.contains(order.getTenantId())){
+                                //C端订单 不能撤销
+                                throw new CustomException(String.format("C端订单不能取消完单【%s】", orderSn));
+                            }
                             if (order.getOrderFrom() == 1) {
                                 //新系统
                                 orderService.update(new LambdaUpdateWrapper<Order>()
@@ -2392,20 +2413,30 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                 //账款未收完 不能完单
                                 throw new CustomException(String.format("订单未审核不能完单【%s】", orderSn));
                             }
-                            //成本设置项
-                            String costJson = order.getCostJson();
-                            if (StringUtils.isBlank(costJson)) {
-                                return;
-                            }
                             //获取机构分成方式
                             SysTenant tenant = sysTenantService
                                     .getOne(new LambdaQueryWrapper<SysTenant>()
                                             .eq(SysTenant::getTenantId, order.getTenantId()));
                             Integer divideModel = tenant.getDivideModel();
+                            //成本设置项
+                            String costJson = order.getCostJson();
+                            if (StringUtils.isBlank(costJson)) {
+                                order.setFinishStatus(1);//已完单
+                                order.setDivideModel(divideModel);
+                                order.setAccomplishTime(DateUtils.getNowTime());
+                                //修改订单分成
+                                updateById(order);
+                                return;
+                            }
                             //分成金额
                             TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
                             List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
                             if (CollectionUtils.isEmpty(itemList)) {
+                                order.setFinishStatus(1);//已完单
+                                order.setDivideModel(divideModel);
+                                order.setAccomplishTime(DateUtils.getNowTime());
+                                //修改订单分成
+                                updateById(order);
                                 return;
                             }
                             //分成模板
@@ -2581,7 +2612,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         List<TopOldOrderCheck> checkList = topOldOrderCheckService
                 .list(new LambdaQueryWrapper<TopOldOrderCheck>().in(TopOldOrderCheck::getCheckType, Arrays.asList(5, 6))
                         .orderByAsc(TopOldOrderCheck::getCheckSort));
-        if (CollectionUtils.isNotEmpty(checkList)) {
+        if (CollectionUtils.isNotEmpty(checkList) && divideTotal.compareTo(BigDecimal.ZERO) > 0) {
             List<TopOldOrderCheckLog> logs = new ArrayList<>();
             for (int i = 0; i < checkList.size(); i++) {
                 TopOldOrderCheck check = checkList.get(i);
@@ -3289,14 +3320,14 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             order.setCreditTime(DateUtils.getNowTime());
             //自动完单
             if (order.getFinishSign() == 0) {
+                //获取机构分成方式
+                SysTenant tenant = sysTenantService
+                        .getOne(new LambdaQueryWrapper<SysTenant>()
+                                .eq(SysTenant::getTenantId, order.getTenantId()));
+                Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel()) ? tenant.getDivideModel() : 1;
                 //成本设置项
                 String costJson = order.getCostJson();
                 if (StringUtils.isNotBlank(costJson)) {
-                    //获取机构分成方式
-                    SysTenant tenant = sysTenantService
-                            .getOne(new LambdaQueryWrapper<SysTenant>()
-                                    .eq(SysTenant::getTenantId, order.getTenantId()));
-                    Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel()) ? tenant.getDivideModel() : 1;
                     //分成金额
                     TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
                     List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
@@ -3305,6 +3336,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         List<TopCostTpItemVo> divideList = itemList.stream().filter(x -> x.getItemCategory() == 1).collect(Collectors.toList());
                         calculateDivide(divideList, order, divideModel);
                     }
+                }else {
+                    order.setFinishStatus(1);//已完单
+                    order.setDivideModel(divideModel);
+                    order.setAccomplishTime(DateUtils.getNowTime());
+                    //修改订单分成
+                    updateById(order);
                 }
 
                 //完单通知旧系统

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

@@ -1330,7 +1330,6 @@
           AND g.`status` = 1
           AND gu.`status` = 1
           AND gu.change_grade = 0
-          AND (SELECT count(*) from user_confirm_info where gu.order_goods_id = order_goods_id) > 0
           AND IFNULL(gu.official_status,0) != 1
     </select>
 

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

@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         top_old_order ot
         LEFT JOIN top_old_order_goods otg ON ot.order_sn = otg.order_sn
         WHERE
-        1 = 1
+        1 = 1 AND ot.`status` = 1
         <if test="businessFullName != null and businessFullName != ''">
             AND INSTR( otg.business_full_name , #{businessFullName} ) > 0
         </if>
@@ -190,7 +190,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `order` o
         LEFT JOIN order_goods og ON o.order_sn = og.order_sn
         WHERE
-        1 = 1
+        1 = 1 AND o.`status` IN  (0,1)
+        AND (
+        isnull( `o`.`input_order_sn` )
+        OR (
+        NOT (
+        `o`.`input_order_sn` IN ( SELECT `top_old_order`.`input_order_sn` FROM `top_old_order` ))))
         <if test="businessFullName != null and businessFullName != ''">
             AND (
             SELECT
@@ -235,6 +240,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="startTime != null and startTime != ''">
             AND o.create_time <![CDATA[ >= ]]> #{startTime}
         </if>
+        <if test="startTime == null">
+            AND o.create_time <![CDATA[ > ]]> #{filtrationTime}
+        </if>
         <if test="endTime != null and endTime != ''">
             AND o.create_time <![CDATA[ <= ]]> #{endTime}
         </if>