MERGE

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -153,5 +153,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: https://www.xyyxt.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -153,5 +153,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: http://test.jqbao.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

zhongzheng-api/src/main/resources/application-prod.yml

@@ -165,5 +165,19 @@ Nuonuo:
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
+oldOrder:
+    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
+    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
+    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
+    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
+    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
+    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
+    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
+    refundPay: https://cloud.xyyxt.net/common/platform/pay
+    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
+
 oldSys:
     host: http://test.jqbao.net
+
+invoice:
+    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -90,16 +91,12 @@ public class TopCourseProjectTypeServiceImpl extends ServiceImpl<TopCourseProjec
         TopCourseProjectType update = BeanUtil.toBean(bo, TopCourseProjectType.class);
         //判断是否有重复命名
         if (bo.getStatus() != -1) {
-            TopCourseProjectTypeQueryBo courseProjectTypeQueryBo = new TopCourseProjectTypeQueryBo();
-            courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
-            courseProjectTypeQueryBo.setEducationId(bo.getEducationId());
-            courseProjectTypeQueryBo.setId(bo.getId());
-            List<Integer> longs = new ArrayList<>();
-            longs.add(1);
-            longs.add(0);
-            courseProjectTypeQueryBo.setStatus(longs);
-            Collection<TopCourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
-            if (CollectionUtils.isEmpty(courseProjectTypeVos)) {
+            List<TopCourseProjectType> topCourseProjectTypes = baseMapper.selectList(new LambdaQueryWrapper<TopCourseProjectType>()
+                    .eq(TopCourseProjectType::getProjectName, bo.getProjectName())
+                    .eq(TopCourseProjectType::getEducationId, bo.getEducationId())
+                    .eq(TopCourseProjectType::getId, bo.getId())
+                    .in(TopCourseProjectType::getStatus, Arrays.asList(0, 1)));
+            if (CollectionUtils.isEmpty(topCourseProjectTypes)) {
                 validEntityBeforeSave(update);
             }
         }

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

@@ -1115,7 +1115,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         updateById(oldOrder);
 
-        if (bo.getCheckStatus() == 1 && oldOrder.getFinishSign() == 0 && oldOrder.getOrderUncollected().compareTo(BigDecimal.ZERO) == 0){
+        if (bo.getCheckStatus() == 1 && oldOrder.getFinishSign() == 0 && oldOrder.getOrderUncollected().compareTo(BigDecimal.ZERO) == 0) {
             //订单审核通过，账款已结清，满足完单条件
             //成本设置项
             TopOldOrder order = getById(oldOrder.getOrderId());
@@ -1125,7 +1125,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 SysTenant tenant = sysTenantService
                         .getOne(new LambdaQueryWrapper<SysTenant>()
                                 .eq(SysTenant::getTenantId, order.getTenantId()));
-                Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel())?tenant.getDivideModel():1;
+                Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel()) ? tenant.getDivideModel() : 1;
                 //分成金额
                 TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
                 List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
@@ -1175,7 +1175,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 respone = HttpUtils.postFormBody(ORDER_CHECK, params);
                 if (!respone.contains("\"Status\":true") && respone.contains("\"ErrorCode\":1081")) {
                     throw new CustomException("业务员正在修改订单，请勿审核！");
-                }else if (!respone.contains("\"Status\":true")) {
+                } else if (!respone.contains("\"Status\":true")) {
                     throw new CustomException("旧系统订单审核接口请求错误");
                 }
             } catch (IOException e) {
@@ -1204,8 +1204,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         //data 为空
                         throw new CustomException("旧系统查询新系统订单号接口请求错误");
                     } else {
-                        oldOrder.setInputOrderSn(data.toString());
-                        updateById(oldOrder);
+                        TopOldOrder topOldOrder = getById(oldOrder.getOrderId());
+                        topOldOrder.setInputOrderSn(data.toString());
+                        updateById(topOldOrder);
                     }
                 } catch (IOException e) {
                     log.error("旧系统查询新系统订单号接口请求错误" + respone1);
@@ -1259,7 +1260,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     List<String> userNames = new ArrayList<>();
                     topOldOrderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
-                        userNames.add(user.getNickname());
+                        userNames.add(user.getRealname());
                         if (ObjectUtil.isNull(user)) {
                             return;
                         }
@@ -1284,7 +1285,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
                     });
                     //消息通知教务
-                    this.informRemind(userNames);
+//                    this.informRemind(userNames);
                     break;
                 case 2: //审核未通过
                     topOldOrderGoods.forEach(item -> {
@@ -1353,6 +1354,20 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             throw new CustomException("旧系统重新审核接口接口请求错误");
         }
 
+        //审核通过消息通知
+        if (bo.getCheckStatus() == 1){
+            List<String> userNames = new ArrayList<>();
+            topOldOrderGoods.forEach(item -> {
+                if (oldOrder.getOrderBase() == 1){
+                    User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
+                    userNames.add(user.getRealname());
+                }else {
+                    userNames.add(item.getUserName());
+                }
+            });
+            this.informRemind(userNames);
+        }
+
         return true;
     }
 
@@ -1659,9 +1674,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     public void informRemind(List<String> userNames) {
         //学员退学提醒 通知教务
         List<TopInformRemindRelevance> remindRelevances = topInformRemindRelevanceService.list(new LambdaQueryWrapper<TopInformRemindRelevance>().eq(TopInformRemindRelevance::getType, 1));
-        InformRemindVo informRemindVo = informRemindService.queryByName("学员退学提醒");
+        InformRemindVo informRemindVo = topInformRemindService.queryByName("学员修改提醒");
         for (TopInformRemindRelevance remindVo : remindRelevances) {
-            if (remindVo.getRelevanceType() == 1){
+            if (remindVo.getRelevanceType() == 1) {
                 //云学堂系统
                 SysUser sysUser = sysUserService.getById(remindVo.getRelevanceId());
                 if (ObjectUtil.isNull(sysUser)) {
@@ -1676,11 +1691,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(informRemindVo.getId());
                     informUserAddBo.setSystemStatus(1);
-                    informUserAddBo.setRemind("学员退学提醒，请尽快处理");
-                    informUserAddBo.setText(String.format("学员【%s】已退学，请及时处理", userNames.stream().collect(Collectors.joining())));
+                    informUserAddBo.setRemind("学员修改提醒，请尽快处理");
+                    informUserAddBo.setText(String.format("学员【%s】已修改，请及时处理", userNames.stream().collect(Collectors.joining())));
+                    informUserAddBo.setTenantId(867735392558919680L);
                     informSysUserService.insertByAddBo(informUserAddBo);
                 }
-            }else {
+            } else {
                 //总正总平台
                 TopSysUser sysUser = topSysUserService.getById(remindVo.getRelevanceId());
                 if (ObjectUtil.isNull(sysUser)) {
@@ -2069,7 +2085,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 break;
         }
         //消息通知
-        informRemindOrderCheck(String.format("【%s】订单审核%s【%s】", bo.getOrderSn(), bo.getCheckResult() == 1?"已通过":"已拒绝",bo.getLoginName()));
+        informRemindOrderCheck(String.format("【%s】订单审核%s【%s】", bo.getOrderSn(), bo.getCheckResult() == 1 ? "已通过" : "已拒绝", bo.getLoginName()));
         return true;
     }
 
@@ -2396,28 +2412,25 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             List<TopCostTpItemVo> divideList = itemList.stream().filter(x -> x.getItemCategory() == 1).collect(Collectors.toList());
                             calculateDivide(divideList, order, divideModel);
                     }
-
                 }
         );
-
-        if (bo.getFinishStatus() == 1){
-            //完单通知旧系统
-            Map<String, String> params = new HashMap<>();
-            Long nowTime = DateUtils.getNowTime();
-            String sign = ToolsUtils.EncoderByMd5( nowTime.toString() + "pubilc2022");
-            params.put("stamp", nowTime.toString());
-            params.put("sign", sign);
-            params.put("orderSn", bo.getOrderSnList().stream().collect(Collectors.joining(",")));
-            String respone = "";
-            try {
-                respone = HttpUtils.postFormBody(FINISH_ORDER, params);
-                if (!respone.contains("\"Status\":true")) {
-                    throw new CustomException("旧系统订单完单接口请求错误");
-                }
-            } catch (IOException e) {
-                log.error("旧系统订单完单接口请求错误" + respone);
+        //完单通知旧系统
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("orderSn", bo.getOrderSnList().stream().collect(Collectors.joining(",")));
+        params.put("auditstatus", bo.getFinishStatus() == 1 ? "1" : "2");
+        String respone = "";
+        try {
+            respone = HttpUtils.postFormBody(FINISH_ORDER, params);
+            if (!respone.contains("\"Status\":true")) {
                 throw new CustomException("旧系统订单完单接口请求错误");
             }
+        } catch (IOException e) {
+            log.error("旧系统订单完单接口请求错误" + respone);
+            throw new CustomException("旧系统订单完单接口请求错误");
         }
         return true;
     }
@@ -2603,7 +2616,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     //完单校验
     private void validFinish(TopFinishOrderBo bo) {
-        if ("admin".equals(bo.getLoginName())){
+        if ("admin".equals(bo.getLoginName())) {
             return;
         }
         //校验当前角色审核权限
@@ -3031,7 +3044,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
                         if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
                                 || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
-                                || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))){
+                                || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))) {
                             tpItems.add(x);
                         }
                     }
@@ -3283,7 +3296,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     SysTenant tenant = sysTenantService
                             .getOne(new LambdaQueryWrapper<SysTenant>()
                                     .eq(SysTenant::getTenantId, order.getTenantId()));
-                    Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel())?tenant.getDivideModel():1;
+                    Integer divideModel = ObjectUtil.isNotNull(tenant.getDivideModel()) ? tenant.getDivideModel() : 1;
                     //分成金额
                     TopCostTpVo topCostTpVo = JSONObject.parseObject(costJson, TopCostTpVo.class);
                     List<TopCostTpItemVo> itemList = topCostTpVo.getItemList();
@@ -3297,7 +3310,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 //完单通知旧系统
                 Map<String, String> params = new HashMap<>();
                 Long nowTime = DateUtils.getNowTime();
-                String sign = ToolsUtils.EncoderByMd5( nowTime.toString() + "pubilc2022");
+                String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
                 params.put("stamp", nowTime.toString());
                 params.put("sign", sign);
                 params.put("orderSn", bo.getOrderSn());