diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccWalletInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccWalletInfoServiceImpl.java index f9ab03f..66b4068 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccWalletInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccWalletInfoServiceImpl.java @@ -298,7 +298,6 @@ public class AccWalletInfoServiceImpl implements IAccWalletInfoService { accTradeWalletDetail.setTradeTime(DateUtils.getNowDate()); accTradeWalletDetail.setCreateBy(SecurityUtils.getUsername()); this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail); - MqUtil.sendDataChange(sysUser.getUserId(), LeMqConstant.DataChangeType.UPDATE, LeMqConstant.Topic.DEVICE_SYNC_ACCOUNT_BALANCE_V4); }catch (Exception ex) { log.error("修改钱包失败", ex); throw new ServiceException("修改钱包失败"); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuRecipeDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuRecipeDishes.java index d7ac652..0f0dc01 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuRecipeDishes.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuRecipeDishes.java @@ -75,5 +75,8 @@ public class MenuRecipeDishes extends Model { ) @ApiModelProperty("更新时间") private LocalDateTime updateTime; + private LocalDateTime saleStart; + private LocalDateTime saleEnd; + private Long chefId; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java index 1febf55..dc69490 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java @@ -47,7 +47,7 @@ public class OrderBusiness { public void reduceMenuDishSupplyNum(List orderDetailList) { for(OrderDetail orderDetail : orderDetailList) { MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes(); - menuRecipeDishes.setDetailId(orderDetail.getDetailId()); + menuRecipeDishes.setDetailId(orderDetail.getMenuDetailId()); menuRecipeDishes.setDishesId(orderDetail.getGoodsId()); menuRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity()); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java index 5963cec..2354888 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java @@ -20,6 +20,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import javax.validation.constraints.NotNull; /** @@ -51,7 +52,7 @@ public class OrderInfoController extends BaseController @PostMapping("/device/list") @ResponseBody - public TableDataInfo deviceList(OrderQueryParam orderQueryParam) + public TableDataInfo deviceList(@RequestBody @Valid OrderQueryParam orderQueryParam) { startPage(); OrderInfo orderInfo = new OrderInfo(); @@ -104,7 +105,7 @@ public class OrderInfoController extends BaseController @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(OrderAddParam orderAddParam) + public AjaxResult addSave(@RequestBody @Valid OrderAddParam orderAddParam) { return toAjax(orderInfoService.insertCanteenOrderInfo(orderAddParam)); } @@ -112,7 +113,7 @@ public class OrderInfoController extends BaseController @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @PostMapping("/device/add") @ResponseBody - public AjaxResult deviceAddSave(DeviceOrderAddParam orderAddParam) + public AjaxResult deviceAddSave(@RequestBody @Valid DeviceOrderAddParam orderAddParam) { return toAjax(orderInfoService.insertDeviceOrderInfo(orderAddParam)); } @@ -120,7 +121,7 @@ public class OrderInfoController extends BaseController @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) @PostMapping("/shop/add") @ResponseBody - public AjaxResult shopAddSave(ShopOrderAddParam orderAddParam) + public AjaxResult shopAddSave(@RequestBody @Valid ShopOrderAddParam orderAddParam) { return toAjax(orderInfoService.insertShopOrderInfo(orderAddParam)); } 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 f6228c8..2c40ac0 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 @@ -226,9 +226,11 @@ public class OrderInfo extends BaseEntity orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount)); orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount)); 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; @@ -320,9 +322,11 @@ public class OrderInfo extends BaseEntity orderInfo.setPayableAmount(orderInfo.getPayableAmount().add(saleTotalAmount)); orderInfo.setDiscountsAmount(orderInfo.getDiscountsAmount().add(discountTotalAmount)); 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; 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 ef263d4..ab967c2 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 @@ -33,6 +33,7 @@ import com.bonus.canteen.core.pay.constants.PayTypeEnum; import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO; import com.bonus.common.core.exception.ServiceException; 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.utils.JacksonUtil; import com.bonus.common.security.utils.SecurityUtils; @@ -204,10 +205,12 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername()); orderInfoMapper.updateOrderPayResult(orderPayResultDTO); try { - DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfoList.get(0).getUserId()),"update"); - String jsonString = JacksonUtil.writeValueAsString(bean); - log.info("账户变动发送mq内容：{}", jsonString); - MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); + if(orderInfoList.get(0).getSourceType().equals(SourceTypeEnum.HT_H5_MOBILE.getKey())) { + DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfoList.get(0).getUserId()),"update"); + String jsonString = JacksonUtil.writeValueAsString(bean); + log.info("账户变动发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); + } } catch (Exception e) { log.error("发送MQ消息失败", e); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDishesMapper.xml index ea86160..9afe00a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDishesMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + 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 fdd711b..8a0e094 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 @@ -181,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into order_info ( order_id, device_order_id, @@ -308,11 +308,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update order_info + update order_info set pay_time = now(), - account_pay_amount = #{param.payAmount}, - pay_state = #{param.payState}, - update_by = #{param.updateBy}, + account_pay_amount = #{param.payAmount}, + pay_state = #{param.payState}, + update_by = #{param.updateBy}, update_time = now() where order_id in