submit

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/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

@@ -1318,7 +1318,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         TopOldOrder oldOrder = baseMapper.getOrderBySn(query.getOrderSn());
         BigDecimal money = BigDecimal.ZERO;
         if (ObjectUtils.isNotNull(oldOrder.getPretaxBrokerage()) && CollectionUtils.isNotEmpty(list)){
-            money = oldOrder.getPretaxBrokerage().divide(new BigDecimal(list.size()));
+            money = oldOrder.getPretaxBrokerage().divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_CEILING);
         }
         //数据处理
         for (TopOldOrderGoodsListVo item : list) {
@@ -1748,7 +1748,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         return true;
     }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean orderRefundPay(OrderRefundPayBo bo) {
@@ -2241,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())
@@ -2251,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())
@@ -2268,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);
             });
         }
 
@@ -3834,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();

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;