From bfff4d73a1377a39f1ab8484cbe8982bc39a5079 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 17 Apr 2025 17:08:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E4=B8=8B=E5=8D=95=E9=80=80?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/canteen/core/order/domain/OrderInfo.java | 4 ++-- .../bonus/canteen/core/order/domain/OrderPayResultDTO.java | 1 + .../canteen/core/order/domain/param/ShopOrderAddParam.java | 2 +- .../canteen/core/order/service/impl/OrderInfoServiceImpl.java | 1 + .../src/main/resources/mapper/account/AccInfoMapper.xml | 4 +--- .../src/main/resources/mapper/account/AccTradeMapper.xml | 2 -- .../src/main/resources/mapper/order/OrderInfoMapper.xml | 1 + 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java index 2c40ac0..8f70bca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java @@ -199,7 +199,7 @@ public class OrderInfo extends BaseEntity orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); - orderInfo.setOrderState(OrderStateEnum.PLACE.getKey()); + orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey()); orderInfo.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setPayType(param.getPayType()); @@ -295,7 +295,7 @@ public class OrderInfo extends BaseEntity orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); - orderInfo.setOrderState(OrderStateEnum.PLACE.getKey()); + orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey()); orderInfo.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setPayType(param.getPayType()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderPayResultDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderPayResultDTO.java index 7259756..c8e2668 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderPayResultDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderPayResultDTO.java @@ -11,4 +11,5 @@ public class OrderPayResultDTO { private Integer payState; private BigDecimal payAmount; private String updateBy; + private Integer orderState; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java index ecddcc6..5d58cf2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java @@ -76,7 +76,7 @@ public class ShopOrderAddParam { orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); - orderInfo.setOrderState(OrderStateEnum.PLACE.getKey()); + orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey()); orderInfo.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setPayType(param.getPayType()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index ab967c2..b55f9fd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -203,6 +203,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderPayResultDTO.setOrderIdList(orderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList())); orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey()); orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername()); + orderPayResultDTO.setOrderState(OrderStateEnum.PLACE.getKey()); orderInfoMapper.updateOrderPayResult(orderPayResultDTO); try { if(orderInfoList.get(0).getSourceType().equals(SourceTypeEnum.HT_H5_MOBILE.getKey())) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index e513c7c..f395b6f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -387,15 +387,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t2.nick_name, t2.phonenumber as phoneNumber, t6.dept_name, - t7.dict_label as userTypeName, - t7.dict_value as userType, + t2.user_type as userType, t1.scope, t1.acc_status, t1.end_date FROM acc_info t1 INNER JOIN sys_user t2 ON t1.user_id = t2.user_id LEFT JOIN sys_dept t6 on t6.dept_id = t2.dept_id - LEFT JOIN sys_dict_data t7 on t7.dict_type = 'user_psn_type' and t7.dict_value = t2.user_type order by t2.create_time desc diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index 64343e9..3e23d27 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -231,7 +231,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" su.phonenumber as phoneNumber, sd.dept_name, su.user_type, - sdd.dict_label as userTypeName, ate.create_by, ate.trade_id, ate.trade_state, @@ -240,7 +239,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM acc_trade ate LEFT JOIN sys_user su ON su.user_id = ate.user_id - LEFT JOIN sys_dict_data sdd on sdd.dict_type = 'user_psn_type' and sdd.dict_value = su.user_type LEFT JOIN sys_dept sd ON sd.dept_id = ate.dept_id LEFT JOIN acc_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml index 8a0e094..e00fa4a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -313,6 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" account_pay_amount = #{param.payAmount}, pay_state = #{param.payState}, update_by = #{param.updateBy}, + order_state = #{param.orderState}, update_time = now() where order_id in