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 16:46:14 +08:00
parent eb1e8a6b39
commit dd8d7f5bd4
8 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,6 @@ public class AccWalletInfoServiceImpl implements IAccWalletInfoService {
accTradeWalletDetail.setTradeTime(DateUtils.getNowDate()); accTradeWalletDetail.setTradeTime(DateUtils.getNowDate());
accTradeWalletDetail.setCreateBy(SecurityUtils.getUsername()); accTradeWalletDetail.setCreateBy(SecurityUtils.getUsername());
this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail); this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail);
MqUtil.sendDataChange(sysUser.getUserId(), LeMqConstant.DataChangeType.UPDATE, LeMqConstant.Topic.DEVICE_SYNC_ACCOUNT_BALANCE_V4);
}catch (Exception ex) { }catch (Exception ex) {
log.error("修改钱包失败", ex); log.error("修改钱包失败", ex);
throw new ServiceException("修改钱包失败"); throw new ServiceException("修改钱包失败");

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuRecipeDishes.java
View File

@ -75,5 +75,8 @@ public class MenuRecipeDishes extends Model<MenuRecipeDishes> {
) )
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private LocalDateTime saleStart;
private LocalDateTime saleEnd;
private Long chefId;
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java
View File

@ -47,7 +47,7 @@ public class OrderBusiness {
public void reduceMenuDishSupplyNum(List<OrderDetail> orderDetailList) { public void reduceMenuDishSupplyNum(List<OrderDetail> orderDetailList) {
for(OrderDetail orderDetail : orderDetailList) { for(OrderDetail orderDetail : orderDetailList) {
MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes(); MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes();
menuRecipeDishes.setDetailId(orderDetail.getDetailId()); menuRecipeDishes.setDetailId(orderDetail.getMenuDetailId());
menuRecipeDishes.setDishesId(orderDetail.getGoodsId()); menuRecipeDishes.setDishesId(orderDetail.getGoodsId());
menuRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity()); menuRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity());
} }

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
View File

@ -20,6 +20,7 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
@ -51,7 +52,7 @@ public class OrderInfoController extends BaseController
@PostMapping("/device/list") @PostMapping("/device/list")
@ResponseBody @ResponseBody
public TableDataInfo deviceList(OrderQueryParam orderQueryParam) public TableDataInfo deviceList(@RequestBody @Valid OrderQueryParam orderQueryParam)
{ {
startPage(); startPage();
OrderInfo orderInfo = new OrderInfo(); OrderInfo orderInfo = new OrderInfo();
@ -104,7 +105,7 @@ public class OrderInfoController extends BaseController
@SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
public AjaxResult addSave(OrderAddParam orderAddParam) public AjaxResult addSave(@RequestBody @Valid OrderAddParam orderAddParam)
{ {
return toAjax(orderInfoService.insertCanteenOrderInfo(orderAddParam)); return toAjax(orderInfoService.insertCanteenOrderInfo(orderAddParam));
} }
@ -112,7 +113,7 @@ public class OrderInfoController extends BaseController
@SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT)
@PostMapping("/device/add") @PostMapping("/device/add")
@ResponseBody @ResponseBody
public AjaxResult deviceAddSave(DeviceOrderAddParam orderAddParam) public AjaxResult deviceAddSave(@RequestBody @Valid DeviceOrderAddParam orderAddParam)
{ {
return toAjax(orderInfoService.insertDeviceOrderInfo(orderAddParam)); return toAjax(orderInfoService.insertDeviceOrderInfo(orderAddParam));
} }
@ -120,7 +121,7 @@ public class OrderInfoController extends BaseController
@SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT)
@PostMapping("/shop/add") @PostMapping("/shop/add")
@ResponseBody @ResponseBody
public AjaxResult shopAddSave(ShopOrderAddParam orderAddParam) public AjaxResult shopAddSave(@RequestBody @Valid ShopOrderAddParam orderAddParam)
{ {
return toAjax(orderInfoService.insertShopOrderInfo(orderAddParam)); return toAjax(orderInfoService.insertShopOrderInfo(orderAddParam));
} }

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

@ -226,9 +226,11 @@ public class OrderInfo extends BaseEntity
orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount)); orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount));
orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount)); orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount));
orderInfo.setRealAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount())); orderInfo.setRealAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount()));
orderInfo.setAccountPayAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount())); orderInfo.setAccountPayAmount(orderInfo.getRealAmount());
} }
orderInfo.setOrderDetailList(orderDetailList);
} }
orderInfoList.add(orderInfo);
} }
} }
return orderInfoList; return orderInfoList;
@ -320,9 +322,11 @@ public class OrderInfo extends BaseEntity
orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount)); orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount));
orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount)); orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount));
orderInfo.setRealAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount())); orderInfo.setRealAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount()));
orderInfo.setAccountPayAmount(orderInfo.getRealAmount().add(orderDetail.getTotalAmount())); orderInfo.setAccountPayAmount(orderInfo.getRealAmount());
} }
orderInfo.setOrderDetailList(orderDetailList);
} }
orderInfoList.add(orderInfo);
} }
} }
return orderInfoList; return orderInfoList;

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

@ -33,6 +33,7 @@ import com.bonus.canteen.core.pay.constants.PayTypeEnum;
import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO; import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.houqin.constant.SourceTypeEnum;
import com.bonus.common.houqin.mq.constant.LeMqConstant; import com.bonus.common.houqin.mq.constant.LeMqConstant;
import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.common.houqin.utils.JacksonUtil;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
@ -204,10 +205,12 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername()); orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername());
orderInfoMapper.updateOrderPayResult(orderPayResultDTO); orderInfoMapper.updateOrderPayResult(orderPayResultDTO);
try { try {
if(orderInfoList.get(0).getSourceType().equals(SourceTypeEnum.HT_H5_MOBILE.getKey())) {
DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfoList.get(0).getUserId()),"update"); DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfoList.get(0).getUserId()),"update");
String jsonString = JacksonUtil.writeValueAsString(bean); String jsonString = JacksonUtil.writeValueAsString(bean);
log.info("账户变动发送mq内容：{}", jsonString); log.info("账户变动发送mq内容：{}", jsonString);
MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4);
}
} catch (Exception e) { } catch (Exception e) {
log.error("发送MQ消息失败", e); log.error("发送MQ消息失败", e);
} }

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDishesMapper.xml
View File

@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="surplusNum" column="surplus_num" /> <result property="surplusNum" column="surplus_num" />
<result property="restrictNum" column="restrict_num" /> <result property="restrictNum" column="restrict_num" />
<result property="salePrice" column="sale_price" /> <result property="salePrice" column="sale_price" />
<!-- <result property="saleStart" column="sale_start" />--> <result property="saleStart" column="sale_start" />
<!-- <result property="saleEnd" column="sale_end" />--> <result property="saleEnd" column="sale_end" />
<!-- <result property="chefId" column="chef_id" />--> <result property="chefId" column="chef_id" />
<result property="recommendFlag" column="recommend_flag" /> <result property="recommendFlag" column="recommend_flag" />
<result property="sortNum" column="sort_num" /> <result property="sortNum" column="sort_num" />
<result property="revision" column="revision" /> <result property="revision" column="revision" />

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

@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<insert id="batchInsertOrderInfo" parameterType="com.bonus.canteen.core.order.domain.OrderInfo"> <insert id="batchInsertOrderInfo">
insert into order_info ( insert into order_info (
order_id, order_id,
device_order_id, device_order_id,
@ -308,11 +308,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<update id="updateOrderPayResult"> <update id="updateOrderPayResult">
update order_info update order_info set
pay_time = now(), pay_time = now(),
<if test="payAmount != null">account_pay_amount = #{param.payAmount},</if> <if test="param.payAmount != null">account_pay_amount = #{param.payAmount},</if>
<if test="payState != null">pay_state = #{param.payState},</if> <if test="param.payState != null">pay_state = #{param.payState},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{param.updateBy},</if> <if test="param.updateBy != null and param.updateBy != ''">update_by = #{param.updateBy},</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=")">