diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java index 4c63ad6..d6a8bd1 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java @@ -158,6 +158,7 @@ public interface LeMqConstant { DEVICE_ONLINE_REPORT_V4("device-online-report-v4", "通知商户下所有设备设备上下线"), DEVICE_ORDER_DISHES_STATE_UPDATE_V4("device-order-dishes-state-update-v4", "推送订单制作配送状态更新"), DEVICE_LOCKER_STATUS_V4("device-locker-status-v4", "推送更新智能餐柜状态"), + DEVICE_UPDATE_ORDER_STATE_V4("device-update-order-state-v4", "推送取消设备订单"), BACK_DEVICE_IOT_GATEWAY_V4("back-device-iot-gateway-v4", "后场推送网关设备信息"), BACK_DEVICE_UPDATE_PERSONAL_CONFIG_V4("back-device-update-person-config-v4", "通知设备后场人员和特征值更新"), BACK_CABINET_UPDATE_SETTING_CONFIG_V4("back-cabinet-update-setting-config-v4", "通知设备留样柜基础设置更新"), diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeDishesServiceImpl.java index 4409d49..2efe242 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeDishesServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.canteen.core.menu.mapper.MenuRecipeDetailMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.constant.GlobalConstants; +import com.bonus.common.houqin.utils.JacksonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -107,6 +108,7 @@ public class MenuRecipeDishesServiceImpl extends ServiceImpl orderDetailList) { + log.info("订单扣减库存入参：{}", JacksonUtil.writeValueAsString(orderDetailList)); for(OrderDetail orderDetail : orderDetailList) { if(OrderDetailTypeEnum.KEYAMOUNT.getKey().equals(orderDetail.getDetailType())) { continue; @@ -86,13 +87,14 @@ public class OrderBusiness { } public void addMenuDishSupplyNum(List orderDetailList) { + log.info("订单新增库存入参：{}", JacksonUtil.writeValueAsString(orderDetailList)); for(OrderDetail orderDetail : orderDetailList) { if(OrderDetailTypeEnum.KEYAMOUNT.getKey().equals(orderDetail.getDetailType())) { continue; } MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes(); ObjectUtils.setAllFieldsToNull(menuRecipeDishes); - menuRecipeDishes.setDetailId(orderDetail.getDetailId()); + menuRecipeDishes.setDetailId(orderDetail.getMenuDetailId()); menuRecipeDishes.setDishesId(orderDetail.getGoodsId()); menuRecipeDishesService.addMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity()); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderStateEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderStateEnum.java index 2a4cf74..d4c940c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderStateEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderStateEnum.java @@ -1,5 +1,7 @@ package com.bonus.canteen.core.order.constants; +import org.apache.commons.lang3.StringUtils; + public enum OrderStateEnum { PLACE(1, "已下单"), FINISH(2, "已完成"), @@ -21,4 +23,13 @@ public enum OrderStateEnum { public String getDesc() { return this.desc; } + + public static String getDescByKey(Integer key) { + for (OrderStateEnum orderState : OrderStateEnum.values()) { + if (orderState.getKey().equals(key)) { + return orderState.getDesc(); + } + } + return StringUtils.EMPTY; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/OrderMqListenerTimeout.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/OrderMqListenerTimeout.java new file mode 100644 index 0000000..8f50539 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/OrderMqListenerTimeout.java @@ -0,0 +1,41 @@ +package com.bonus.canteen.core.order.mq; + +import com.bonus.canteen.core.common.utils.MqPayload; +import com.bonus.canteen.core.order.mq.bo.OrderCancelBO; +import com.bonus.canteen.core.order.service.IOrderInfoService; +import com.bonus.common.houqin.mq.MQListener; +import com.bonus.common.houqin.mq.MQMessageListener; +import com.bonus.common.houqin.utils.JacksonUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; + +import java.util.Objects; + +@MQMessageListener( + group = "order-order-v3-async-timeout", + topic = "order", + tag = "order-v3-async-timeout" +) +public class OrderMqListenerTimeout implements MQListener> { + private static final Logger log = LoggerFactory.getLogger(OrderMqListenerTimeout.class); + + @Autowired + @Lazy + private IOrderInfoService orderInfoService; + + public void onMessage(MqPayload payload) { + log.info("[订单超时MQ]收到消息 {}", payload); + OrderCancelBO payloadData = JacksonUtil.readValue(payload.getData(), OrderCancelBO.class); + if(Objects.nonNull(payloadData)) { + try { + this.orderInfoService.timeOutCancel(payloadData.getOrderId(), "system"); + }catch (Exception ex) { + log.error("[订单超时MQ]处理异常", ex); + } + }else { + log.error("[订单超时MQ]收到消息为空"); + } + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/DeviceRefundOrderBO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/DeviceRefundOrderBO.java new file mode 100644 index 0000000..6db0945 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/DeviceRefundOrderBO.java @@ -0,0 +1,8 @@ +package com.bonus.canteen.core.order.mq.bo; + +import lombok.Data; + +@Data +public class DeviceRefundOrderBO { + private String deviceOrderId; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/OrderCancelBO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/OrderCancelBO.java new file mode 100644 index 0000000..0b0e300 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/bo/OrderCancelBO.java @@ -0,0 +1,10 @@ +package com.bonus.canteen.core.order.mq.bo; + +import lombok.Data; + +@Data +public class OrderCancelBO { + private Long orderId; + private Long merchantId; + private String traceId; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/utils/OrderMQUtils.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/utils/OrderMQUtils.java new file mode 100644 index 0000000..556c3f8 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mq/utils/OrderMQUtils.java @@ -0,0 +1,29 @@ +package com.bonus.canteen.core.order.mq.utils; + +import cn.hutool.core.lang.UUID; +import com.bonus.canteen.core.common.utils.MqUtil; +import com.bonus.canteen.core.order.mq.bo.OrderCancelBO; +import com.bonus.common.houqin.constant.GlobalConstants; +import com.bonus.common.houqin.mq.constant.LeMqConstant; +import com.bonus.common.houqin.utils.JacksonUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.LocalDateTime; + +public class OrderMQUtils { + private static final Logger log = LoggerFactory.getLogger(OrderMQUtils.class); + public static LocalDateTime orderTimeoutByOrderId(Long orderId, int delaySecond) { + log.info("[订单MQ]发送未支付订单异步支付超时通知, 订单ID: {}", orderId); + try { + OrderCancelBO orderCancelPO = new OrderCancelBO(); + orderCancelPO.setOrderId(orderId); + orderCancelPO.setMerchantId(GlobalConstants.TENANT_ID); + orderCancelPO.setTraceId(UUID.fastUUID().toString()); + MqUtil.sendDelay(JacksonUtil.writeValueAsString(orderCancelPO), LeMqConstant.Topic.ORDER_V3_ASYNC_TIMEOUT, delaySecond * 1000); + }catch (Exception ex) { + log.error("[订单MQ]发送未支付订单超时通知失败, 订单ID: {}", orderId, ex); + } + return LocalDateTime.now().plusSeconds(delaySecond); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java index 456ce93..923444b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java @@ -71,6 +71,6 @@ public interface IOrderInfoService public void refund(Long orderId, String operationUser); public void pay(Long orderId); List orderRefundHistory(OrderRefundHistoryParam param); - public void writeOffOrderByOrderIds(OrderWriteOffParam param); + public void timeOutCancel(Long orderId, String operationUser); } 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 276d28c..99365cd 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 @@ -24,6 +24,8 @@ import com.bonus.canteen.core.order.constants.OrderStateEnum; import com.bonus.canteen.core.order.domain.*; import com.bonus.canteen.core.order.domain.param.*; import com.bonus.canteen.core.order.mapper.OrderInfoMapper; +import com.bonus.canteen.core.order.mq.bo.DeviceRefundOrderBO; +import com.bonus.canteen.core.order.mq.utils.OrderMQUtils; import com.bonus.canteen.core.order.service.IOrderDetailService; import com.bonus.canteen.core.order.service.IOrderInfoService; import com.bonus.canteen.core.pay.constants.PayChannelEnum; @@ -62,6 +64,7 @@ import java.util.stream.Collectors; public class OrderInfoServiceImpl implements IOrderInfoService { private static final Logger log = LoggerFactory.getLogger(OrderInfoServiceImpl.class); + private static final String ORDER_REFUND_REDIS_KEY = "sc:order_refund_orderId_%s"; @Autowired private OrderInfoMapper orderInfoMapper; @Autowired @@ -127,7 +130,6 @@ public class OrderInfoServiceImpl implements IOrderInfoService List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); order.setOrderDetailList(orderDetailList); order.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(order.getPhoneNumber())); - order.setMealtimeName(AllocMealtimeTypeEnum.getDescByKey(order.getMealtimeType())); }); } return orderInfoList; @@ -152,6 +154,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderBusiness.orderPay(orderInfoList); }catch (Exception ex) { orderBusiness.updateOrderPayFailed(orderInfoList); + for(OrderInfo orderInfo : orderInfoList) { + OrderMQUtils.orderTimeoutByOrderId(orderInfo.getOrderId(), 60 * 10); + } throw new ServiceException(ex.getMessage(), 500001); }finally { AccRedisUtils.unlockUpdateAccWalletBalance(orderAddParam.getUserId()); @@ -364,7 +369,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService if(Objects.isNull(orderInfo)) { throw new ServiceException("订单不存在"); } - String refundKey = String.format("sc:order_refund_orderId_%s", orderId); + String refundKey = String.format(ORDER_REFUND_REDIS_KEY, orderId); if (!RedisUtil.setNx(refundKey, 1, 2)) { log.info("退单处理中：{}", refundKey); throw new ServiceException("退单处理中"); @@ -378,6 +383,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService // if(orderInfo.getOrderState().equals(OrderStateEnum.FINISH.getKey())) { // throw new ServiceException("订单已核销"); // } + List orderDetailList = null; if(PayStateEnum.PAY_SUCC.getKey().equals(orderInfo.getPayState())) { List accTradeList = accTradeService.queryTradeAndWallerInfoByOrderNo (String.valueOf(orderId), AccTradeTypeEnum.CONSUME); @@ -411,7 +417,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderInfoMapper.updateOrderInfo(refundOrderInfo); OrderDetail orderDetailQuery = new OrderDetail(); orderDetailQuery.setOrderId(orderId); - List orderDetailList = orderDetailService.selectOrderDetailList(orderDetailQuery); + orderDetailList = orderDetailService.selectOrderDetailList(orderDetailQuery); for(OrderDetail orderDetail : orderDetailList) { orderDetail.setRefundAmount(orderDetail.getRealAmount()); orderDetail.setRefundNum(orderDetail.getQuantity()); @@ -419,12 +425,18 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderDetail.setUpdateBy(StringUtils.isBlank(operationUser) ? SecurityUtils.getUsername() : operationUser); orderDetailService.updateOrderDetail(orderDetail); } - orderBusiness.addMenuDishSupplyNum(orderDetailList); try { DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfo.getUserId()),"update"); String jsonString = JacksonUtil.writeValueAsString(bean); log.info("账户变动发送mq内容：{}", jsonString); MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); + if(StringUtils.isNotBlank(orderInfo.getDeviceOrderId())) { + DeviceRefundOrderBO deviceRefundOrderBO = new DeviceRefundOrderBO(); + deviceRefundOrderBO.setDeviceOrderId(orderInfo.getDeviceOrderId()); + String deviceJsonString = JacksonUtil.writeValueAsString(deviceRefundOrderBO); + log.info("设备订单退款发送mq内容：{}", deviceJsonString); + MqUtil.pushToTenantAllDevice(deviceRefundOrderBO, LeMqConstant.Topic.DEVICE_UPDATE_ORDER_STATE_V4); + } } catch (Exception e) { log.error("发送MQ消息失败", e); } @@ -436,6 +448,44 @@ public class OrderInfoServiceImpl implements IOrderInfoService refundOrderInfo.setUpdateBy(StringUtils.isBlank(operationUser) ? SecurityUtils.getUsername() : operationUser); refundOrderInfo.setUpdateTime(DateUtils.getNowDate()); orderInfoMapper.updateOrderInfo(refundOrderInfo); + OrderDetail orderDetailQuery = new OrderDetail(); + orderDetailQuery.setOrderId(orderId); + orderDetailList = orderDetailService.selectOrderDetailList(orderDetailQuery); + } + if (orderDetailList != null) { + orderBusiness.addMenuDishSupplyNum(orderDetailList); + } + } + @Override + @Transactional(rollbackFor = {Exception.class}) + public void timeOutCancel(Long orderId, String operationUser) { + log.info("订单超时取消：{}", orderId); + if(Objects.isNull(orderId) || orderId <= 0) { + throw new ServiceException("订单ID不能为空"); + } + OrderInfo orderInfo = selectOrderInfoByOrderId(orderId); + if(Objects.isNull(orderInfo)) { + throw new ServiceException("订单不存在"); + } + String refundKey = String.format(ORDER_REFUND_REDIS_KEY, orderId); + if (!RedisUtil.setNx(refundKey, 1, 2)) { + log.info("退单处理中：{}", refundKey); + throw new ServiceException("退单处理中"); + } + if(orderInfo.getOrderState().equals(OrderStateEnum.WAIT_PLACE.getKey())) { + OrderInfo refundOrderInfo = new OrderInfo(); + refundOrderInfo.setOrderId(orderId); + refundOrderInfo.setOrderRefundState(OrderRefundStateEnum.FINISH.getKey()); + refundOrderInfo.setOrderState(OrderStateEnum.CANCEL.getKey()); + refundOrderInfo.setUpdateBy(StringUtils.isBlank(operationUser) ? SecurityUtils.getUsername() : operationUser); + refundOrderInfo.setUpdateTime(DateUtils.getNowDate()); + orderInfoMapper.updateOrderInfo(refundOrderInfo); + OrderDetail orderDetailQuery = new OrderDetail(); + orderDetailQuery.setOrderId(orderId); + List orderDetailList = orderDetailService.selectOrderDetailList(orderDetailQuery); + orderBusiness.addMenuDishSupplyNum(orderDetailList); + }else { + log.info("[MQ超时订单]订单状态：{}", OrderStateEnum.getDescByKey(orderInfo.getOrderState())); } } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderShoppingCartServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderShoppingCartServiceImpl.java index 665bd19..313aa59 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderShoppingCartServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderShoppingCartServiceImpl.java @@ -1,9 +1,6 @@ package com.bonus.canteen.core.order.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; @@ -21,6 +18,8 @@ import com.bonus.canteen.core.order.service.IOrderShoppingCartService; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.utils.id.Id; import com.bonus.common.security.utils.SecurityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +33,8 @@ import org.springframework.stereotype.Service; @Service public class OrderShoppingCartServiceImpl implements IOrderShoppingCartService { + private static final Logger log = LoggerFactory.getLogger(OrderShoppingCartServiceImpl.class); + @Autowired private OrderShoppingCartMapper orderShoppingCartMapper; @Autowired @@ -86,7 +87,12 @@ public class OrderShoppingCartServiceImpl implements IOrderShoppingCartService .findFirst().orElse(null); menuDishCheckDTO.setApplyDate(orderDateStr); - Map> menuRecipeDishMap = menuModule.getMenuRecipeDish(menuDishCheckDTO); + Map> menuRecipeDishMap = new HashMap<>(); + try{ + menuRecipeDishMap = menuModule.getMenuRecipeDish(menuDishCheckDTO); + }catch (Exception ex) { + log.info("菜单数据获取失败：" + ex.getMessage()); + } for (OrderShoppingCart shoppingCart : carts) { OrderShoppingCartVO shoppingCartVO = convertToOrderShoppingCartVO(shoppingCart, menuRecipeDishMap); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpDeliveryGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpDeliveryGoods.java index c16a8ff..4e48a0b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpDeliveryGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpDeliveryGoods.java @@ -37,25 +37,25 @@ public class DrpDeliveryGoods { @ApiModelProperty("送货仓库id") private Long deliveryWarehouseId; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiry.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiry.java index 0944b09..1167a86 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiry.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiry.java @@ -52,25 +52,25 @@ public class DrpInquiry { @ApiModelProperty("乐观锁") private Integer revision; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") private LocalDateTime updateTime; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiryDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiryDetail.java index 8a93061..5273277 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiryDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquiryDetail.java @@ -40,25 +40,25 @@ public class DrpInquiryDetail { @ApiModelProperty("备注") private String remark; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @ApiModelProperty("创建时间") @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquirySupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquirySupplier.java index 517a5b8..e510dc4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquirySupplier.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInquirySupplier.java @@ -39,25 +39,25 @@ public class DrpInquirySupplier { private Integer revision; @ApiModelProperty("创建人") @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @ApiModelProperty("创建时间") @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoods.java index 95f3a18..ab8ed59 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoods.java @@ -49,25 +49,25 @@ public class DrpInspectGoods { @ApiModelProperty("签名") private String signaturePicUrl; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoodsDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoodsDetail.java index 62f3bad..c8171ed 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoodsDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInspectGoodsDetail.java @@ -45,25 +45,25 @@ public class DrpInspectGoodsDetail { @ApiModelProperty("货品拍照") private String checkPicUrls; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInventory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInventory.java index d44f680..abced5d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInventory.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpInventory.java @@ -42,25 +42,25 @@ public class DrpInventory { @ApiModelProperty("乐观锁") private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMarketPrice.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMarketPrice.java index 4245a1f..bada8bc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMarketPrice.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMarketPrice.java @@ -27,23 +27,23 @@ public class DrpMarketPrice implements Serializable { private String harvestSource; private Integer delFlag; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquiry.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquiry.java index 6850006..2cf5968 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquiry.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquiry.java @@ -59,15 +59,27 @@ public class DrpMaterialInquiry { @ApiModelProperty("发布时间") private LocalDateTime releaseTime; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; + @TableField( + value = "create_time", + fill = FieldFill.INSERT + ) private LocalDateTime createTime; @ApiModelProperty("更新人") + @TableField( + value = "update_by", + fill = FieldFill.INSERT + ) private String updateBy; @ApiModelProperty("更新时间") + @TableField( + value = "update_time", + fill = FieldFill.INSERT + ) private LocalDateTime updateTime; @ApiModelProperty("审批流ID") private Long processInstanceId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquirySupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquirySupplier.java index e5b1388..2e5291c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquirySupplier.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialInquirySupplier.java @@ -29,22 +29,22 @@ public class DrpMaterialInquirySupplier { @ApiModelProperty("供应商意向中标状态(3接受4拒绝)") private Integer smTargetPriceStatus; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialLatestPrice.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialLatestPrice.java index 39bf4bd..5e3aa3e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialLatestPrice.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialLatestPrice.java @@ -30,12 +30,12 @@ public class DrpMaterialLatestPrice implements Serializable { private LocalDateTime startTime; private LocalDateTime endTime; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialWinBidRecords.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialWinBidRecords.java index d7bd5b1..bc7eb1f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialWinBidRecords.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMaterialWinBidRecords.java @@ -26,24 +26,24 @@ public class DrpMaterialWinBidRecords { private Long winSupplierId; @ApiModelProperty("创建人") @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @ApiModelProperty("创建时间") @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMenuMaterialSupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMenuMaterialSupplier.java index 3d3fb59..d672c03 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMenuMaterialSupplier.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpMenuMaterialSupplier.java @@ -24,25 +24,25 @@ public class DrpMenuMaterialSupplier implements Serializable { private Long categoryId; private Integer delFlag; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoods.java index 0fb4c5e..289e9e2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoods.java @@ -35,25 +35,25 @@ public class DrpOrderGoods { @ApiModelProperty("删除标识") private Integer delFlag; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoodsDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoodsDetail.java index 5f4ae18..54dbe11 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoodsDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpOrderGoodsDetail.java @@ -32,25 +32,25 @@ public class DrpOrderGoodsDetail { @ApiModelProperty("总金额") private Integer totalPrice; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProcurementContract.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProcurementContract.java index ba2e440..13eda63 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProcurementContract.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProcurementContract.java @@ -50,21 +50,21 @@ public class DrpProcurementContract implements Serializable { private String contractPerson; private Integer delFlag; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE) private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProductionPlan.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProductionPlan.java index 57d89a4..13011f6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProductionPlan.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpProductionPlan.java @@ -20,25 +20,25 @@ public class DrpProductionPlan { @ApiModelProperty("删除标识(1是2否)") private Integer delFlag; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurNotice.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurNotice.java index 7c280fe..078ba97 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurNotice.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurNotice.java @@ -44,25 +44,25 @@ public class DrpPurNotice { private Integer revision; @ApiModelProperty("创建人") @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @ApiModelProperty("创建时间") @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurchasePlan.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurchasePlan.java index c02820c..38e4287 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurchasePlan.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpPurchasePlan.java @@ -23,25 +23,25 @@ public class DrpPurchasePlan { private String productionPlanId; private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQualityInspect.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQualityInspect.java index d073c18..f358ddb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQualityInspect.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQualityInspect.java @@ -21,25 +21,25 @@ public class DrpQualityInspect { @ApiModelProperty("质检报告图片地址") private String imageUrl; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQuote.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQuote.java index 09c673e..ae2729b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQuote.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpQuote.java @@ -31,25 +31,25 @@ public class DrpQuote { private Integer revision; @ApiModelProperty("创建人") @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @ApiModelProperty("创建时间") @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplier.java index e1fdbbf..c307000 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplier.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplier.java @@ -103,23 +103,23 @@ public class DrpSupplier { @ApiModelProperty("乐观锁") private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) private String updateBy; @ApiModelProperty("更新时间") @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) private LocalDateTime updateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierDeliver.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierDeliver.java index 45fba2d..35e5fa0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierDeliver.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierDeliver.java @@ -25,25 +25,25 @@ public class DrpSupplierDeliver { @ApiModelProperty("供应商id") private Long supplierId; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierQualification.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierQualification.java index 8c276dc..ed16f3f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierQualification.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpSupplierQualification.java @@ -38,25 +38,25 @@ public class DrpSupplierQualification { @ApiModelProperty("乐观锁") private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpUnit.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpUnit.java index 692185b..ad53c81 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpUnit.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpUnit.java @@ -18,25 +18,25 @@ public class DrpUnit { private Integer delFlag; private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpWarehouse.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpWarehouse.java index ef39463..0a43171 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpWarehouse.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/bo/DrpWarehouse.java @@ -32,25 +32,25 @@ public class DrpWarehouse { @ApiModelProperty("乐观锁") private Integer revision; @TableField( - value = "createBy", + value = "create_by", fill = FieldFill.INSERT ) @ApiModelProperty("创建人") private String createBy; @TableField( - value = "createTime", + value = "create_time", fill = FieldFill.INSERT ) @ApiModelProperty("创建时间") private LocalDateTime createTime; @TableField( - value = "updateBy", + value = "update_by", fill = FieldFill.UPDATE ) @ApiModelProperty("更新人") private String updateBy; @TableField( - value = "updateTime", + value = "update_time", fill = FieldFill.UPDATE ) @ApiModelProperty("更新时间")