submit

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

@@ -1326,7 +1326,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 +1634,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 +1890,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             default:
                 break;
         }
-        if (order.getOrderFrom() != 1){
-            order.setCheckBy(bo.getLoginName());
-            updateById(order);
-        }
-
         return true;
     }
 
@@ -1926,6 +1921,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 +1946,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 +2098,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 {