bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单-下单退单

This commit is contained in:
gaowdong 2025-04-17 17:08:23 +08:00
parent dd8d7f5bd4
commit bfff4d73a1
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java
View File

@ -199,7 +199,7 @@ public class OrderInfo extends BaseEntity
orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType);
orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName());
orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); 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.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey());
orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey());
orderInfo.setPayType(param.getPayType()); orderInfo.setPayType(param.getPayType());
@ -295,7 +295,7 @@ public class OrderInfo extends BaseEntity
orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType);
orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName());
orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); 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.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey());
orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey());
orderInfo.setPayType(param.getPayType()); orderInfo.setPayType(param.getPayType());

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderPayResultDTO.java
View File

@ -11,4 +11,5 @@ public class OrderPayResultDTO {
private Integer payState; private Integer payState;
private BigDecimal payAmount; private BigDecimal payAmount;
private String updateBy; private String updateBy;
private Integer orderState;
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java
View File

@ -76,7 +76,7 @@ public class ShopOrderAddParam {
orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType);
orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName());
orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); 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.setOrderRefundState(OrderRefundStateEnum.UN_REFUND.getKey());
orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey()); orderInfo.setDeductionType(DeductionTypeEnum.PAY_PLACE.getKey());
orderInfo.setPayType(param.getPayType()); orderInfo.setPayType(param.getPayType());

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java
View File

@ -203,6 +203,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderPayResultDTO.setOrderIdList(orderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList())); orderPayResultDTO.setOrderIdList(orderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList()));
orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey()); orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey());
orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername()); orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername());
orderPayResultDTO.setOrderState(OrderStateEnum.PLACE.getKey());
orderInfoMapper.updateOrderPayResult(orderPayResultDTO); orderInfoMapper.updateOrderPayResult(orderPayResultDTO);
try { try {
if(orderInfoList.get(0).getSourceType().equals(SourceTypeEnum.HT_H5_MOBILE.getKey())) { if(orderInfoList.get(0).getSourceType().equals(SourceTypeEnum.HT_H5_MOBILE.getKey())) {

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
View File

@ -387,15 +387,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t2.nick_name, t2.nick_name,
t2.phonenumber as phoneNumber, t2.phonenumber as phoneNumber,
t6.dept_name, t6.dept_name,
t7.dict_label as userTypeName, t2.user_type as userType,
t7.dict_value as userType,
t1.scope, t1.scope,
t1.acc_status, t1.acc_status,
t1.end_date t1.end_date
FROM acc_info t1 FROM acc_info t1
INNER JOIN sys_user t2 ON t1.user_id = t2.user_id 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_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
<include refid="queryAccountInfo_ref"/> <include refid="queryAccountInfo_ref"/>
order by t2.create_time desc order by t2.create_time desc
</select> </select>

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -231,7 +231,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.phonenumber as phoneNumber, su.phonenumber as phoneNumber,
sd.dept_name, sd.dept_name,
su.user_type, su.user_type,
sdd.dict_label as userTypeName,
ate.create_by, ate.create_by,
ate.trade_id, ate.trade_id,
ate.trade_state, ate.trade_state,
@ -240,7 +239,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
acc_trade ate acc_trade ate
LEFT JOIN sys_user su ON su.user_id = ate.user_id 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 sys_dept sd ON sd.dept_id = ate.dept_id
LEFT JOIN acc_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id LEFT JOIN acc_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id
<where> <where>

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -313,6 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="param.payAmount != null">account_pay_amount = #{param.payAmount},</if> <if test="param.payAmount != null">account_pay_amount = #{param.payAmount},</if>
<if test="param.payState != null">pay_state = #{param.payState},</if> <if test="param.payState != null">pay_state = #{param.payState},</if>
<if test="param.updateBy != null and param.updateBy != ''">update_by = #{param.updateBy},</if> <if test="param.updateBy != null and param.updateBy != ''">update_by = #{param.updateBy},</if>
<if test="param.orderState != null">order_state = #{param.orderState},</if>
update_time = now() update_time = now()
where order_id in where order_id in
<foreach item="orderId" collection="param.orderIdList" open="(" separator="," close=")"> <foreach item="orderId" collection="param.orderIdList" open="(" separator="," close=")">