fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderHandleController.java

@@ -69,7 +69,16 @@ public class OrderHandleController extends BaseController {
         return getDataTable(list);
     }
 
-
+    @ApiOperation("查询经办录单详情")
+    @PreAuthorize("@ss.hasPermi('system:handle:list')")
+    @GetMapping("/detail")
+    public AjaxResult<OrderHandleVo> detail(OrderHandleQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setCreateUserId(loginUser.getUser().getUserId());
+        List<OrderHandleVo> list = iOrderHandleService.selectList(bo);
+        return AjaxResult.success(list.get(0));
+    }
 
     /**
      * 新增经办录单

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -970,7 +970,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             User user2 = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone,EncryptHandler.encrypt(itemImport.getTelphone())).last("limit 1"));
             if(Validator.isNotEmpty(user2)){
-                throw new CustomException(itemImport.getRealname()+"-"+itemImport.getTelphone()+"-号码已存在，创建失败",439);
+                throw new CustomException(itemImport.getTelphone(),439);
             }
         }
         User inertData = new User();

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

@@ -879,7 +879,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (Validator.isEmpty(bo.getUserId())) {
             throw new CustomException("用户ID缺失", 510);
         }
-        if (Validator.isEmpty(bo.getInputOrderSn())) {
+        if (Validator.isEmpty(bo.getHandleOrderSn())) {
             throw new CustomException("录单单号为空", 510);
         }
         OrderHandle orderHandle = iOrderHandleService.queryBySn(bo.getHandleOrderSn());
@@ -927,22 +927,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
                 }
             }
-//            if (goods.getGoodsStatus() != 1) {
-//                throw new CustomException(goods.getGoodsName()+"商品已下架，请重新选择商品下单", 510);
-//            }
+            if (goods.getGoodsStatus() != 1) {
+                throw new CustomException(goods.getGoodsName()+"商品已下架，请重新选择商品下单", 510);
+            }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
-            if (g.getGoodsReceived().compareTo(g.getGoodsRealPrice()) == 1) {
-                throw new CustomException("已收费大于成交价", 510);
-            }
+
             if (StringUtils.isNotBlank(goods.getSevenYear())){
                 orderGoods.setSevenYear(goods.getSevenYear());
             }
             //成交价
-            orderGoods.setGoodsRealPrice(g.getGoodsRealPrice());
+            orderGoods.setGoodsPrice(goods.getStandPrice());
+            orderGoods.setGoodsRealPrice(goods.getStandPrice());
+            orderGoods.setGoodsReceived(orderGoods.getGoodsRealPrice());
             orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());