merge

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

@@ -1070,17 +1070,17 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 //底单在新系统 查询新系统订单号
                 Map<String, String> params1 = new HashMap<>();
                 Long nowTime1 = DateUtils.getNowTime();
-                String sign1 = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+                String sign1 = ToolsUtils.EncoderByMd5(nowTime1.toString() + "pubilc2022");
                 params1.put("stamp", nowTime1.toString());
                 params1.put("sign", sign1);
                 params1.put("orderSn", oldOrder.getOrderSn());
                 String respone1 = "";
                 try {
-                    respone1 = HttpUtils.postFormBody(INPUT_ORDER, params);
-                    if (!respone.contains("\"Status\":true")) {
+                    respone1 = HttpUtils.postFormBody(INPUT_ORDER, params1);
+                    if (!respone1.contains("\"Status\":true")) {
                         throw new CustomException("旧系统查询新系统订单号接口请求错误");
                     }
-                    JSONObject jsonObject = JSONObject.parseObject(respone);
+                    JSONObject jsonObject = JSONObject.parseObject(respone1);
                     Object data = jsonObject.get("Data");
                     if (ObjectUtils.isNull(data)) {
                         //data 为空
@@ -1090,7 +1090,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         updateById(oldOrder);
                     }
                 } catch (IOException e) {
-                    log.error("旧系统查询新系统订单号接口请求错误" + respone);
+                    log.error("旧系统查询新系统订单号接口请求错误" + respone1);
                     throw new CustomException("旧系统查询新系统订单号接口请求错误");
                 }
             }
@@ -1121,22 +1121,25 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         List<TopOldOrderGoods> list = topOrderGoodsService.listByIds(bo.getOrderGoodsIds());
         list.forEach(x -> x.setCheckStatus(bo.getCheckStatus()));
+        List<String> signIds = Arrays.stream(oldOrder.getCheckRemark().split(",")).filter(x -> !bo.getOrderGoodsIds().contains(x)).collect(Collectors.toList());
+        List<TopOldOrderGoods> topOldOrderGoods = topOrderGoodsService.
+                list(new LambdaQueryWrapper<TopOldOrderGoods>()
+                .eq(TopOldOrderGoods::getCheckStatus, -1)
+                .eq(TopOldOrderGoods::getOrderSn, bo.getOrderSn())
+                .in(TopOldOrderGoods::getSignId, signIds));
         if (StringUtils.isNotBlank(oldOrder.getCheckRemark()) && bo.getCheckStatus() == 2){
-            List<Long> collect = list.stream().map(TopOldOrderGoods::getSignId).collect(Collectors.toList());
-            List<String> collect1 = Arrays.stream(oldOrder.getCheckRemark().split(",")).filter(x -> !collect.contains(x)).collect(Collectors.toList());
                 //不通过 恢复数据
-                topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
-                        .set(TopOldOrderGoods::getCheckStatus,1)
-                        .eq(TopOldOrderGoods::getOrderSn,bo.getOrderSn())
-                        .in(TopOldOrderGoods::getSignId,collect1));
+                topOldOrderGoods.forEach(x -> x.setCheckStatus(1));
+                topOrderGoodsService.updateBatchById(topOldOrderGoods);
         }
         topOrderGoodsService.updateBatchById(list);
+
         if (oldOrder.getOrderBase() == 1) {
             //处理退学学员 并且订单在新系统
             switch (bo.getCheckStatus()) {
                 case 1://审核通过
                     List<String> userNames = new ArrayList<>();
-                    list.forEach(item -> {
+                    topOldOrderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
                         userNames.add(user.getNickname());
                         if (ObjectUtil.isNull(user)) {
@@ -1166,7 +1169,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     this.informRemind(userNames);
                     break;
                 case 2: //审核未通过
-                    list.forEach(item -> {
+                    topOldOrderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
                         if (ObjectUtil.isNull(user)) {
                             return;
@@ -1326,7 +1329,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         orderRefundList.forEach(refund -> {
             TopOldOrderGoods item = topOrderGoodsService.getById(refund.getOrderGoodsId());
             User user = userService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard, EncryptHandler.encrypt(item.getUserCard())));
+                    .eq(User::getIdCard,item.getUserCard()));
             if (ObjectUtils.isNotNull(user)) {
                 //处理新系统订单商品
                 List<Order> list = orderService
@@ -1634,7 +1637,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(order.getInputOrderSn()) && order.getOrderBase() == 1) {
             orderGoods.forEach(item -> {
                 User user = userService.getOne(new LambdaQueryWrapper<User>()
-                        .eq(User::getIdCard, EncryptHandler.encrypt(item.getUserCard())));
+                        .eq(User::getIdCard, item.getUserCard()));
                 if (ObjectUtils.isNotNull(user)) {
                     //处理新系统订单商品
                     List<Order> list = orderService
@@ -1890,11 +1893,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             default:
                 break;
         }
-        if (order.getOrderFrom() != 1){
-            order.setCheckBy(bo.getLoginName());
-            updateById(order);
-        }
-
         return true;
     }
 
@@ -1926,6 +1924,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             // 订单退款通知业务系统
             if (oldOrder.getOrderFrom() != 1){
                 checkInform(bo.getOrderSn(),type,bo.getCheckReason(),2,0,String.format("审核中（%s）",bo.getCheckRoleName()));
+                oldOrder.setCheckBy(bo.getLoginName());
+                updateById(oldOrder);
             }
 
         } else {
@@ -1949,13 +1949,14 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
                 update(new LambdaUpdateWrapper<TopOldOrder>()
                         .set(TopOldOrder::getRefundStatus, 4) //未通过
+                        .set(TopOldOrder::getCheckBy,bo.getLoginName())
                         .eq(TopOldOrder::getOrderSn, refundList.get(0).getOrderSn()));
                 if (oldOrder.getOrderBase() == 1){
                     //底单在新系统
                     List<TopOldOrderGoods> orderGoods = topOrderGoodsService.listByIds(orderGoodsIds);
                     orderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>()
-                                .eq(User::getIdCard, EncryptHandler.encrypt(item.getUserCard())));
+                                .eq(User::getIdCard, item.getUserCard()));
                         if (ObjectUtils.isNotNull(user)) {
                             //处理新系统订单商品
                             List<Order> list = orderService
@@ -2100,6 +2101,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             if (periodStatus == 2) {
                 update(new LambdaUpdateWrapper<TopOldOrder>()
                         .set(TopOldOrder::getRefundStatus, 2) //未退款
+                        .set(TopOldOrder::getCheckBy,bo.getLoginName())
                         .eq(TopOldOrder::getOrderSn, refundList.get(0).getOrderSn()));
             }
         }else {

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

@@ -75,16 +75,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="checkStatus != null">
             AND vto.check_status = #{checkStatus}
         </if>
+        <if test="refundStatus != null">
+            AND vto.refund_status = #{refundStatus}
+        </if>
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND vto.refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="creditStatus != null and creditStatus != '' and creditStatus == 0">
+        <if test="creditStatus != null and creditStatus == 0">
             AND vto.order_received <![CDATA[ < ]]> vto.pay_price
         </if>
-        <if test="creditStatus != null and creditStatus != '' and creditStatus == 1">
+        <if test="creditStatus != null and creditStatus == 1">
             AND vto.pay_price = vto.order_received
         </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">