MERGE

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

@@ -3499,11 +3499,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         }
     }
 
-    public static void main(String[] args) {
-        String encrypt = EncryptHandler.encrypt("440506198204281419");
-        System.out.println("encrypt = " + encrypt);
-    }
-
     private boolean checkNameUnique(Question entity) {
         Question info = getOne(new LambdaQueryWrapper<Question>()
                 .eq(Question::getPrefixName, entity.getPrefixName()).eq(Question::getContent, entity.getContent()).ne(Question::getStatus, -1).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -893,7 +893,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                     .eq(UserSubscribe::getSubscribeStatus,1)
                     .eq(UserSubscribe::getExamStatus,0)
                     .last("limit 1"));
-            if (ObjectUtils.isNotNull(userSubscribeTwo)){
+
+            String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+            SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
+            if (ObjectUtils.isNotNull(userSubscribeTwo) && tenant.getExamRoom() != 2){
                 Goods goods = iGoodsService.getById(goodsUserVo.getGoodsId());
                 if (ObjectUtils.isNull(goods.getQuestionGoodsId())){
                     //没有关联题库 是否购买过题库

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

@@ -78,6 +78,8 @@ import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
@@ -192,6 +194,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private  IProfileTpService iProfileTpService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
 
 
     @Override
@@ -744,7 +749,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                         .eq(UserSubscribe::getSubscribeStatus,1)
                         .eq(UserSubscribe::getExamStatus,0)
                         .last("limit 1"));
-                if (ObjectUtils.isNotNull(userSubscribeTwo)){
+                String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+                SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
+                if (ObjectUtils.isNotNull(userSubscribeTwo) &&  tenant.getExamRoom() != 2){
                     Goods goods = iGoodsService.getById(goodsVo.getGoodsId());
                     if (ObjectUtils.isNull(goods.getQuestionGoodsId())){
                         //没有关联题库 是否购买过题库

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

@@ -1296,7 +1296,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCheckStatus(1);//C端订单不需要审核
         add.setOrderRefundStatus(1);
         add.setInvoiceStatus(0);
-        add.setFinishStatus(type == 1? 1:0);
+        if (ObjectUtils.isNull(add.getPayPrice()) || add.getPayPrice().compareTo(BigDecimal.ZERO) == 0 ){
+            add.setFinishStatus(1);
+        }else {
+            add.setFinishStatus(type == 1? 1:0);
+        }
         add.setCreditStatus(0);
         add.setOrderBase(1);
         add.setOrderRefund(BigDecimal.ZERO);

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.domain.*;
 import com.zhongzheng.modules.bank.service.*;

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

@@ -494,8 +494,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 if (ObjectUtils.isNotNull(item.getOrderRefunded())){
                     orderPractical = orderPractical.subtract(item.getOrderRefunded());
                 }
-                if (ObjectUtils.isNotNull(item.getPretaxBrokerage())){
-                    orderPractical = orderPractical.add(item.getPretaxBrokerage());
+                if (ObjectUtils.isNotNull(item.getRepairMoneyTotal())){
+                    orderPractical = orderPractical.add(item.getRepairMoneyTotal());
                 }
                 item.setOrderPractical(orderPractical);
             });
@@ -1317,8 +1317,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         //奖金
         TopOldOrder oldOrder = baseMapper.getOrderBySn(query.getOrderSn());
         BigDecimal money = BigDecimal.ZERO;
-        if (ObjectUtils.isNotNull(oldOrder.getPretaxBrokerage())){
-            money = oldOrder.getPretaxBrokerage().divide(new BigDecimal(list.size()));
+        if (ObjectUtils.isNotNull(oldOrder.getPretaxBrokerage()) && CollectionUtils.isNotEmpty(list)){
+            money = oldOrder.getPretaxBrokerage().divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_CEILING);
         }
         //数据处理
         for (TopOldOrderGoodsListVo item : list) {
@@ -1347,6 +1347,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return list;
     }
 
+    public static void main(String[] args) {
+        System.out.println(EncryptHandler.decrypt("21bac9a89b8500cbad449f1e0644cf4fdcf042e4c2933c31a2a602da0d0f5f77"));
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -1526,7 +1529,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 if (!respone.contains("\"Status\":true") && respone.contains("\"ErrorCode\":1081")) {
                     throw new CustomException("业务员正在修改订单，请勿审核！");
                 } else if (!respone.contains("\"Status\":true")) {
-                    throw new CustomException("旧系统订单审核接口请求错误");
+                    JSONObject jsonObject = JSONObject.parseObject(respone);
+                    throw new CustomException(jsonObject.get("ErrorMessage").toString());
                 }
             } catch (IOException e) {
                 log.error("旧系统订单审核接口请求错误" + respone);
@@ -1744,7 +1748,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         return true;
     }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean orderRefundPay(OrderRefundPayBo bo) {
@@ -2237,7 +2240,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
             for (TopOldOrderGoods orderGoods : orderGoodsList) {
                 business.add(orderGoods.getBusinessFullName());
-                goodsUpVos.add(getGoodsUp(orderGoods,studyVos));
+                TopOrderGoodsUpVo goodsUp = getGoodsUp(orderGoods, studyVos);
                 //获取修改前的数据
                 List<TopOldOrderGoods> list = topOrderGoodsService.list(new LambdaQueryWrapper<TopOldOrderGoods>()
                         .eq(TopOldOrderGoods::getOrderSn, orderGoods.getOrderSn())
@@ -2247,14 +2250,24 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     for (TopOldOrderGoods goods : list) {
                         business.add(orderGoods.getBusinessFullName());
                         goodsUpVos.add(getGoodsUp(goods,studyVos));
+                        if (!goods.getUserName().equals(orderGoods.getUserName())){
+                            goodsUp.setUserNameSign(1);
+                        }
+                        if (!goods.getUserCard().equals(orderGoods.getUserCard())){
+                            goodsUp.setUserCardSign(1);
+                        }
+                        if (!goods.getUserPhone().equals(orderGoods.getUserPhone())){
+                            goodsUp.setUserPhoneSign(1);
+                        }
                     }
                 }
+                goodsUpVos.add(goodsUp);
             }
         }else {
             //底单在新系统
             orderGoodsList.forEach(item -> {
                 business.add(item.getBusinessFullName());
-                goodsUpVos.add(getGoodsUpVo(item,orderVo.getInputOrderSn()));
+                TopOrderGoodsUpVo goodsUpVo = getGoodsUpVo(item, orderVo.getInputOrderSn());
                 //获取修改前的数据
                 List<TopOldOrderGoods> list = topOrderGoodsService.list(new LambdaQueryWrapper<TopOldOrderGoods>()
                         .eq(TopOldOrderGoods::getOrderSn, item.getOrderSn())
@@ -2264,8 +2277,18 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     for (TopOldOrderGoods goods : list) {
                         business.add(item.getBusinessFullName());
                         goodsUpVos.add(getGoodsUpVo(goods,orderVo.getInputOrderSn()));
+                        if (!goods.getUserName().equals(item.getUserName())){
+                            goodsUpVo.setUserNameSign(1);
+                        }
+                        if (!goods.getUserCard().equals(item.getUserCard())){
+                            goodsUpVo.setUserCardSign(1);
+                        }
+                        if (!goods.getUserPhone().equals(item.getUserPhone())){
+                            goodsUpVo.setUserPhoneSign(1);
+                        }
                     }
                 }
+                goodsUpVos.add(goodsUpVo);
             });
         }
 
@@ -3830,12 +3853,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
                 trendVos = JSONArray.parseArray(JSONObject.toJSONString(data),TopConversionRateTrendVo.class);
-                if (bo.getType() != 3){
-                    trendVos.forEach(item -> {
-                        Long aLong = DateUtils.dateTimeSec("yyyy/MM/dd", item.getDate());
-                        item.setDate(DateUtils.timestampToDateFormat(aLong,"yyyy-MM-dd"));
-                    });
-                }
+//                if (bo.getType() != 3){
+//                    trendVos.forEach(item -> {
+//                        Long aLong = DateUtils.dateTimeSec("yyyy/MM/dd", item.getDate());
+//                        item.setDate(DateUtils.timestampToDateFormat(aLong,"yyyy-MM-dd"));
+//                    });
+//                }
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -4562,11 +4585,20 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (CollectionUtils.isEmpty(refunds)) {
             return vo;
         }
+        Integer count = topOrderGoodsService
+                .count(new LambdaQueryWrapper<TopOldOrderGoods>()
+                .eq(TopOldOrderGoods::getOrderSn, orderSn)
+                .eq(TopOldOrderGoods::getCheckStatus, 1)
+                .eq(TopOldOrderGoods::getStatus, 1));
         vo.setOrderId(orderVo.getOrderId());
         vo.setOrderSn(orderVo.getOrderSn());
         vo.setOrderUncollected(orderVo.getOrderUncollected());
         vo.setOrderReceived(orderVo.getOrderReceived());
-        vo.setBrokerage(orderVo.getPretaxBrokerage());
+        BigDecimal decimal = orderVo.getPretaxBrokerage();
+        if (ObjectUtils.isNotNull(decimal) && count > 0){
+            decimal = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
+            vo.setBrokerage(decimal);
+        }
         vo.setInvoiceStatus(orderVo.getInvoiceStatus());
         Map<String, List<TopOldOrderRefundVo>> map = refunds.stream().collect(Collectors.groupingBy(TopOldOrderRefundVo::getRefundSn));
         if (map.keySet().size() > 1) {
@@ -4585,11 +4617,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                         topRefundUserVo.setRefundReason(item.getApplyReason());
                         topRefundUserVo.setOrderSn(orderSn);
-                        BigDecimal money = BigDecimal.ZERO;
-                        if (ObjectUtils.isNotNull(orderVo.getPretaxBrokerage()) && CollectionUtils.isNotEmpty(v)){
-                            money = orderVo.getPretaxBrokerage().divide(new BigDecimal(v.size()));
+                        BigDecimal decimal1 = orderVo.getPretaxBrokerage();
+                        if (ObjectUtils.isNotNull(decimal1) && count > 0){
+                            decimal1 = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
+                            topRefundUserVo.setBrokerage(decimal1);
                         }
-                        topRefundUserVo.setBrokerage(money);
                         if (item.getRefundType() == 1) {
                             //学员信息
                             Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, item.getOrderSn()));
@@ -4630,11 +4662,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                 topRefundUserVo.setRefundReason(item.getApplyReason());
                 topRefundUserVo.setOrderSn(orderSn);
-                BigDecimal money = BigDecimal.ZERO;
-                if (ObjectUtils.isNotNull(orderVo.getPretaxBrokerage()) && CollectionUtils.isNotEmpty(refunds)){
-                    money = orderVo.getPretaxBrokerage().divide(new BigDecimal(refunds.size()));
+                BigDecimal decimal1 = orderVo.getPretaxBrokerage();
+                if (ObjectUtils.isNotNull(decimal1) && count > 0){
+                    decimal1 = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
+                    topRefundUserVo.setBrokerage(decimal1);
                 }
-                topRefundUserVo.setBrokerage(money);
                 if (item.getRefundType() == 1) {
                     //学员信息
                     Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, item.getOrderSn()));
@@ -5139,7 +5171,16 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             }
                             if (order.getCheckStatus() != 1) {
                                 //账款未收完 不能完单
-                                throw new CustomException(String.format("订单未审核不能完单【%s】", orderSn));
+                                throw new CustomException(String.format("订单审核状态未通过，不能完单【%s】", orderSn));
+                            }
+                            if (order.getOrderFrom() == 1) {
+                                //新系统
+                                orderService.update(new LambdaUpdateWrapper<Order>()
+                                        .set(Order::getFinishStatus, bo.getFinishStatus())//未完单
+                                        .set(Order::getDivideStatus,2)//待审核
+                                        .eq(Order::getOrderSn, orderSn)
+                                        .eq(Order::getTenantId, order.getTenantId()));
+                                return;
                             }
                             //成本设置项
                             String costJson = order.getCostJson();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOrderGoodsUpVo.java

@@ -27,6 +27,15 @@ public class TopOrderGoodsUpVo implements Serializable {
     @ApiModelProperty("学员手机号")
     private String userPhone;
 
+    @ApiModelProperty("学员姓名修改标识")
+    private Integer userNameSign;
+
+    @ApiModelProperty("学员身份证修改标识")
+    private Integer userCardSign;
+
+    @ApiModelProperty("学员手机号修改标识")
+    private Integer userPhoneSign;
+
     @ApiModelProperty("商品名称")
     private String goodsName;