From 7ae4be2b6e3f9fa060d09cbcd4546f917329c674 Mon Sep 17 00:00:00 2001 From: fanlian <1944275521@qq.com> Date: Wed, 9 Apr 2025 21:50:17 +0800 Subject: [PATCH] ls --- .../order/controller/OrderController.java | 80 ++------ .../order/controller/PackingController.java | 97 +++------- .../order/controller/PurchaseController.java | 30 +-- .../controller/TradeRecordController.java | 11 +- .../xmomen/module/order/entity/TbOrder.java | 180 +++++++----------- .../module/order/entity/TbOrderItem.java | 60 +++--- .../module/order/entity/TbOrderRef.java | 20 +- .../module/order/entity/TbOrderRelation.java | 20 +- .../module/order/entity/TbOrderSendLog.java | 30 ++- .../xmomen/module/order/entity/TbPacking.java | 20 +- .../module/order/entity/TbPackingRecord.java | 25 +-- .../module/order/entity/TbPurchase.java | 55 +++--- .../module/order/entity/TbReturnOrder.java | 60 +++--- .../order/entity/TbReturnOrderItem.java | 30 ++- .../module/order/entity/TbTradeRecord.java | 35 ++-- .../module/order/model/CreateOrder.java | 114 +++++------ .../module/order/model/CreatePacking.java | 4 +- .../order/model/CreatePackingRecord.java | 4 +- .../module/order/model/CreatePurchase.java | 4 +- .../module/order/model/OrderItemModel.java | 29 ++- .../xmomen/module/order/model/OrderModel.java | 180 ++++++++---------- .../order/model/OrderPurchaseModel.java | 4 +- .../xmomen/module/order/model/OrderQuery.java | 4 +- .../module/order/model/PackingModel.java | 4 +- .../order/model/PackingOrderItemModel.java | 4 +- .../module/order/model/PackingOrderModel.java | 4 +- .../module/order/model/PackingOrderQuery.java | 4 +- .../module/order/model/PackingQuery.java | 4 +- .../order/model/PackingRecordModel.java | 34 ++-- .../order/model/PackingRecordQuery.java | 9 +- .../module/order/model/PackingTask.java | 14 +- .../module/order/model/PackingTaskCount.java | 4 +- .../xmomen/module/order/model/PayOrder.java | 4 +- .../module/order/model/PurchaseModel.java | 4 +- .../module/order/model/RefundOrder.java | 4 +- .../module/order/model/ReturnOrder.java | 4 +- .../xmomen/module/order/model/ScanModel.java | 39 ++-- .../module/order/model/TradeRecordModel.java | 35 ++-- .../module/order/model/UpdateOrder.java | 4 +- .../module/order/model/WxCreateOrder.java | 78 +++----- 40 files changed, 491 insertions(+), 858 deletions(-) diff --git a/src/main/java/com/xmomen/module/order/controller/OrderController.java b/src/main/java/com/xmomen/module/order/controller/OrderController.java index 6991b3f..e0b8757 100644 --- a/src/main/java/com/xmomen/module/order/controller/OrderController.java +++ b/src/main/java/com/xmomen/module/order/controller/OrderController.java @@ -29,9 +29,7 @@ import com.xmomen.module.order.model.UpdateOrder; import com.xmomen.module.order.service.OrderService; import com.xmomen.module.wx.model.AjaxResult; -/** - * Created by Jeng on 2016/3/30. - */ + @RestController public class OrderController { @@ -41,14 +39,7 @@ public class OrderController { @Autowired MybatisDao mybatisDao; - /** - * 订单列表 - * - * @param limit - * @param offset - * @param keyword - * @return - */ + // 查询订单列表 @RequestMapping(value = "/order", method = RequestMethod.GET) @Log(actionName = "查询订单列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -109,11 +100,8 @@ public class OrderController { return orderService.getOrderList(orderQuery, limit, offset); } - /** - * 订单明细 - * - * @return - */ + + // 查询订单详情 @RequestMapping(value = "/order/{id}", method = RequestMethod.GET) @Log(actionName = "查询订单列表") public OrderModel getOrderDetail(@PathVariable(value = "id") Integer id) { @@ -126,13 +114,8 @@ public class OrderController { return null; } - /** - * 新增订单 - * - * @param createOrder - * @param bindingResult - * @return - */ + + // 新增订单 @RequestMapping(value = "/order", method = RequestMethod.POST) @Log(actionName = "新增订单") public TbOrder createOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException { @@ -144,13 +127,8 @@ public class OrderController { return orderService.createOrder(createOrder); } - /** - * 批量新增订单 - * - * @param createOrder - * @param bindingResult - * @return - */ + + // 批量新增订单 @RequestMapping(value = "/order/batch", method = RequestMethod.POST) @Log(actionName = "批量新增订单") public void batchCreateOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException { @@ -162,13 +140,8 @@ public class OrderController { orderService.batchCreateOrder(createOrder); } - /** - * 更新订单 - * - * @param updateOrder - * @param bindingResult - * @return - */ + + // 更新订单 @RequestMapping(value = "/order/{id}", method = RequestMethod.PUT) @Log(actionName = "更新订单") public TbOrder updateOrder( @@ -182,14 +155,8 @@ public class OrderController { return orderService.updateOrder(updateOrder); } - /** - * 订单商品列表 - * - * @param limit - * @param offset - * @param orderNo - * @return - */ + + // 查询订单商品列表 @RequestMapping(value = "/order/{id}/item", method = RequestMethod.GET) @Log(actionName = "查询订单商品列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -200,24 +167,16 @@ public class OrderController { return mybatisDao.selectPageByModel(tbOrderItem, limit, offset); } - /** - * 取消订单 - * - * @param id - */ + + // 取消订单 @RequestMapping(value = "/order/{id}", method = RequestMethod.DELETE) @Log(actionName = "取消订单") public void cancelOrder(@PathVariable(value = "id") Integer id) { orderService.cancelOrder(id); } - /** - * 更新订单装箱数 - * - * @param createOrder - * @param bindingResult - * @return - */ + + // 更新订单装箱数 @RequestMapping(value = "/order/updateTotalBox", method = RequestMethod.POST) @Log(actionName = "更新订单装箱数") public void updateTotalBox(@RequestParam(value = "orderNo") String orderNo, @@ -225,11 +184,8 @@ public class OrderController { orderService.updateTotalBox(orderNo, totalBox); } - /** - * 二次配送审核 - * - * @param id - */ + + // 二次配送审核 @RequestMapping(value = "/order/{id}/twoSend", method = RequestMethod.POST) @Log(actionName = "二次配送审核") public AjaxResult twoSendOrder(@PathVariable(value = "id") Integer id, @RequestParam(value = "auditStatusCd") Integer auditStatusCd) { diff --git a/src/main/java/com/xmomen/module/order/controller/PackingController.java b/src/main/java/com/xmomen/module/order/controller/PackingController.java index bbf6796..2f9c787 100644 --- a/src/main/java/com/xmomen/module/order/controller/PackingController.java +++ b/src/main/java/com/xmomen/module/order/controller/PackingController.java @@ -21,28 +21,24 @@ import javax.validation.Valid; import java.util.List; -/** - * Created by Jeng on 2016/3/30. - */ + @RestController public class PackingController { + // 自动装配PackingService @Autowired PackingService packingService; + // 自动装配OrderService @Autowired OrderService orderService; + // 自动装配MybatisDao @Autowired MybatisDao mybatisDao; - /** - * 装箱记录列表 - * @param limit - * @param offset - * @param keyword - * @return - */ + + // 查询装箱记录列表 @RequestMapping(value = "/packing", method = RequestMethod.GET) @Log(actionName = "查询装箱记录列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -57,12 +53,8 @@ public class PackingController { return packingService.getPackingList(packingQuery, limit, offset); } - /** - * 新增装箱记录 - * @param createPacking - * @param bindingResult - * @return - */ + + // 新增装箱记录 @RequestMapping(value = "/packing", method = RequestMethod.POST) @Log(actionName = "新增装箱记录") public TbPacking createPacking(@RequestBody @Valid CreatePacking createPacking, BindingResult bindingResult) throws ArgumentValidException { @@ -72,13 +64,8 @@ public class PackingController { return packingService.create(createPacking); } - /** - * 装箱记录列表 - * @param limit - * @param offset - * @param keyword - * @return - */ + + // 查询装箱任务统计列表 @RequestMapping(value = "/packing/task", method = RequestMethod.GET) @Log(actionName = "查询装箱任务统计列表") public Page getPackingTaskList(@RequestParam(value = "limit") Integer limit, @@ -89,12 +76,8 @@ public class PackingController { return packingService.getPackingTaskCountList(null, limit, offset); } - /** - * 分配装箱任务 - * @param packingTask - * @param bindingResult - * @return - */ + + // 分配装箱任务 @RequestMapping(value = "/packing/task/bind", method = RequestMethod.PUT) @Log(actionName = "分配装箱任务") public void createPacking(@RequestBody @Valid PackingTask packingTask, BindingResult bindingResult) throws ArgumentValidException { @@ -104,11 +87,8 @@ public class PackingController { packingService.dispatchPackingTask(packingTask); } - /** - * 分配装箱任务 - * @param orderNoList - * @throws ArgumentValidException - */ + + // 取消分配装箱任务 @RequestMapping(value = "/packing/task/unbind", method = RequestMethod.PUT) @Log(actionName = "取消分配装箱任务") public void unbind(@RequestParam(value = "orderNos", required = true)String[] orderNoList) throws ArgumentValidException { @@ -118,6 +98,7 @@ public class PackingController { packingService.cancelPackingTask(orderNoList); } + // 装箱订单列表 @RequestMapping(value = "/packing/order", method = RequestMethod.GET) @Log(actionName = "装箱订单列表") public Page queryPackingOrder(@RequestParam(value = "limit") Integer limit, @@ -171,24 +152,16 @@ public class PackingController { return orderModePage; } - /** - * 删除装箱记录 - * @param id - */ + + // 删除装箱记录 @RequestMapping(value = "/packing/{id}", method = RequestMethod.DELETE) @Log(actionName = "删除装箱记录") public void deletePacking(@PathVariable(value = "id") Integer id){ packingService.delete(id); } - /** - * 商品装箱汇总 - * @param packingId - * @param orderId - * @param limit - * @param offset - * @return - */ + + // 查询装箱订单 @RequestMapping(value = "/packing/{id}/order") public Page queryPackingOrder(@PathVariable(value = "id") Integer packingId, @RequestParam(value = "orderId") Integer orderId, @@ -203,11 +176,8 @@ public class PackingController { return packingService.queryPackingOrder(packingOrderQuery, limit, offset); } - /** - * 订单打印 - * @param orderId 订单ID - * @return - */ + + // 打印订单 @RequestMapping(value = "/packing/printOrder") public OrderModel printOrder(@RequestParam(value = "orderId") Integer orderId){ OrderModel orderModel = null; @@ -237,6 +207,7 @@ public class PackingController { } + // 查询装箱订单项 @RequestMapping(value = "/packing/order/item") public Page queryPackingOrderItem(@RequestParam(value = "orderNos", required = false) String[] orderNos, @RequestParam(value = "limit") Integer limit, @@ -246,16 +217,8 @@ public class PackingController { return packingService.queryPackingOrderItem(packingOrderQuery, limit, offset); } - /** - * 查询装箱记录 - * - * @param packingId - * @param orderItemId - * @param keyword - * @param limit - * @param offset - * @return - */ + + // 查询装箱记录 @RequestMapping(value = "/packing/{id}/record", method = RequestMethod.GET) public Page queryPackingRecord(@PathVariable(value = "id") Integer packingId, @RequestParam(value = "orderItemId") Integer orderItemId, @@ -269,14 +232,8 @@ public class PackingController { return packingService.queryPackingRecord(packingRecordQuery, limit, offset); } - /** - * 装箱扫码 - * - * @param createPackingRecord - * @param bindingResult - * @return - * @throws ArgumentValidException - */ + + // 新增装箱记录 @RequestMapping(value = "/packing/record", method = RequestMethod.POST) @Log(actionName = "新增装箱记录") public ScanModel createPackingRecord(@RequestBody @Valid CreatePackingRecord createPackingRecord, BindingResult bindingResult) throws ArgumentValidException { @@ -286,6 +243,7 @@ public class PackingController { return packingService.createRecord(createPackingRecord); } + // 删除装箱记录 @RequestMapping(value = "/packing/{id}/record/{recordId}", method = RequestMethod.DELETE) @Log(actionName = "删除装箱记录") public void createPackingRecord(@PathVariable(value = "id") Integer id, @@ -293,6 +251,7 @@ public class PackingController { packingService.deleteRecord(recordId); } + // 订单自动装箱 @RequestMapping(value = "/packing/auto", method = RequestMethod.POST) @Log(actionName = "订单自动装箱") public List autoPacking(@RequestParam(value = "packingId") Integer packingId, diff --git a/src/main/java/com/xmomen/module/order/controller/PurchaseController.java b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java index d8bf803..3212e9e 100644 --- a/src/main/java/com/xmomen/module/order/controller/PurchaseController.java +++ b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java @@ -25,9 +25,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -/** - * Created by Jeng on 2016/3/30. - */ + @RestController public class PurchaseController { @@ -39,13 +37,7 @@ public class PurchaseController { @Autowired MybatisDao mybatisDao; - /** - * 采购单列表 - * @param limit - * @param offset - * @param keyword - * @return - */ + @RequestMapping(value = "/purchase", method = RequestMethod.GET) @Log(actionName = "查询采购单列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -70,12 +62,7 @@ public class PurchaseController { return purchaseService.getPurchaseList(param, limit, offset); } - /** - * 新增采购单 - * @param createPurchase - * @param bindingResult - * @return - */ + @RequestMapping(value = "/purchase", method = RequestMethod.POST) @Log(actionName = "新增采购单") public void createPurchase(@RequestBody @Valid CreatePurchase createPurchase, BindingResult bindingResult) throws ArgumentValidException { @@ -85,11 +72,7 @@ public class PurchaseController { purchaseService.createPurchase(createPurchase); } - /** - * 修改采购状态 - * @param id - * @param purchaseStatus - */ + @RequestMapping(value = "/purchase/{id}", method = RequestMethod.PUT) @Log(actionName = "修改采购状态") public void createPurchase(@PathVariable(value = "id") Integer id, @@ -99,10 +82,7 @@ public class PurchaseController { - /** - * 删除采购单 - * @param id - */ + @RequestMapping(value = "/purchase/{id}", method = RequestMethod.DELETE) @Log(actionName = "删除采购单") diff --git a/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java index deb95a7..757e5c4 100644 --- a/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java +++ b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java @@ -15,21 +15,14 @@ import com.xmomen.module.logger.Log; import com.xmomen.module.order.mapper.TradeRecordMapper; import com.xmomen.module.order.model.TradeRecordModel; -/** - */ + @RestController public class TradeRecordController { // 注入MybatisDao @Autowired MybatisDao mybatisDao; - /** - * 查看交易记录 - * @param limit - * @param offset - * @param keyword - * @return - */ + // 使用@RequestMapping注解指定请求路径和请求方法 @RequestMapping(value = "/tradeRecord", method = RequestMethod.GET) // 使用@Log注解记录操作日志 diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrder.java b/src/main/java/com/xmomen/module/order/entity/TbOrder.java index a933628..f976e85 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbOrder.java +++ b/src/main/java/com/xmomen/module/order/entity/TbOrder.java @@ -13,184 +13,148 @@ import javax.persistence.Version; @Entity @Table(name = "tb_order") public class TbOrder extends BaseMybatisModel { - /** - * 订单ID - */ + + // 订单ID private Integer id; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; - /** - * 1-卡，2-劵，3-常规，4-活动 - */ + + // 订单类型 private Integer orderType; - /** - * 1-微信订单，2-商城订单，3-客服下单，4-采摘订单 - */ + + // 订单来源 private Integer orderSource; - /** - * 付款方式 - */ + + // 支付方式 private Integer paymentMode; - /** - * 附加付款方式 - */ + + // 其他支付方式 private Integer otherPaymentMode; - /** - * 客户代码 - */ + + // 会员号 private String memberCode; - /** - * 订单状态 - */ + + // 订单状态 private String orderStatus; - /** - * 交易状态：0-待支付，1-已支付 - */ + + // 支付状态 private Integer payStatus; - /** - * 收货人手机 - */ + + // 收货人电话 private String consigneePhone; - /** - * 收货人姓名 - */ + + // 收货人姓名 private String consigneeName; - /** - * 收货人地址 - */ + + // 收货人地址 private String consigneeAddress; - /** - * 邮政编码 - */ + + // 邮编 private String postcode; - /** - * 运送方式 1-快递，2-自提 - */ + + // 运输方式 private Integer transportMode; - /** - * 订单备注 - */ + + // 备注 private String remark; - /** - * 折扣金额 - */ + + // 折扣价格 private BigDecimal discountPrice; - /** - * 订单总金额 - */ + + // 总金额 private BigDecimal totalAmount; - /** - * 订单创建时间 - */ + + // 创建时间 private Date createTime; - /** - * 预约时间 - */ + + // 预约时间 private Date appointmentTime; - /** - * 订单创建人ID - */ + + // 创建人ID private Integer createUserId; - /** - * 发运快递 - */ + + // 发货快递ID private Integer despatchExpressId; - /** - * 快递员ID - */ + + // 快递会员ID private Integer expressMemberId; - /** - * 单位ID - */ + + // 公司ID private Integer companyId; - /** - * 客户经理ID - */ + + // 管理员ID private Integer managerId; - /** - * 批次号 - */ + + // 批次号 private String batchNo; - /** - * 装箱总箱数 - */ + + // 总箱数 private Integer totalBoxNum; - /** - * 快递商提货扫描箱数 - */ + + // 快递扫描箱数 private Integer expressScanBoxNum; - /** - * 0无下架商品，1有下架商品 - */ + + // 下架 private Integer xiajia; - /** - * 是否二次配送订单 - */ + + // 是否二次发货 private Integer isTwoSend; - /** - * 二次配送审核时间 - */ + + // 二次发货审核日期 private Date twoSendAuditDate; - /** - * 二次配送审核人 - */ + + // 二次发货审核人ID private Integer twoSendAuditUserId; - /** - * 出库时间 - */ + + // 出库日期 private Date outDate; - /** - * 确认收货时间 - */ + + // 收货日期 private Date shouHuoDate; - /** - * 是否拒绝收货（0-不 1-是） - */ + + // 是否驳回 private Integer isReject; - /** - * 更新时间 - */ + + // 更新日期 private Date updateDate; - /** - * 更新人 - */ + + // 更新人ID private Integer updateUserId; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java b/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java index f309900..e2a1890 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java @@ -13,64 +13,52 @@ import javax.persistence.Version; @Entity @Table(name = "tb_order_item") public class TbOrderItem extends BaseMybatisModel { - /** - * - */ + + // 订单项ID private Integer id; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; - /** - * - */ + + // 商品ID private Integer itemId; - /** - * 商品编码 - */ + + // 商品编码 private String itemCode; - /** - * 商品名称 - */ + + // 商品名称 private String itemName; - /** - * 商品单价 - */ + + // 商品价格 private BigDecimal itemPrice; - /** - * 商品数量 - */ + + // 商品数量 private BigDecimal itemQty; - /** - * 商品单位 - */ + + // 商品单位 private String itemUnit; - /** - * 创建时间 - */ + + // 创建日期 private Date createDate; - /** - * 创建人 - */ + + // 创建用户ID private Integer createUserId; - /** - * 更新时间 - */ + + // 更新日期 private Date updateDate; - /** - * 更新人 - */ + + // 更新用户ID private Integer updateUserId; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java index fd073eb..524ac5b 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java @@ -11,24 +11,20 @@ import javax.persistence.Version; @Entity @Table(name = "tb_order_ref") public class TbOrderRef extends BaseMybatisModel { - /** - * 物理主键 - */ + + // 订单引用ID private Integer id; - /** - * 扩展类型 - */ + + // 引用类型 private String refType; - /** - * 扩展值 - */ + + // 引用值 private String refValue; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRelation.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRelation.java index ea5765b..331bec7 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbOrderRelation.java +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRelation.java @@ -11,24 +11,20 @@ import javax.persistence.Version; @Entity @Table(name = "tb_order_relation") public class TbOrderRelation extends BaseMybatisModel { - /** - * - */ + + // 订单关系表的主键id private Integer id; - /** - * 扩展类型 - */ + + // 关联类型 private String refType; - /** - * 扩展值 - */ + + // 关联值 private String refValue; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderSendLog.java b/src/main/java/com/xmomen/module/order/entity/TbOrderSendLog.java index 4c3950d..2d0e5c3 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbOrderSendLog.java +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderSendLog.java @@ -12,34 +12,28 @@ import javax.persistence.Version; @Entity @Table(name = "tb_order_send_log") public class TbOrderSendLog extends BaseMybatisModel { - /** - * 主键 - */ + + // 订单发送日志id private Integer id; - /** - * 订单ID - */ + + // 订单id private Integer orderId; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; - /** - * 原快递员ID - */ + + // 旧快递员id private Integer oldExpressMemberId; - /** - * 新快递员 - */ + + // 新快递员id private Integer newExpressMemberId; - /** - * 插入时间 - */ + + // 插入日期 private Date insertDate; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/order/entity/TbPacking.java b/src/main/java/com/xmomen/module/order/entity/TbPacking.java index 1ff6145..eeaf7d7 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbPacking.java +++ b/src/main/java/com/xmomen/module/order/entity/TbPacking.java @@ -12,24 +12,20 @@ import javax.persistence.Version; @Entity @Table(name = "tb_packing") public class TbPacking extends BaseMybatisModel { - /** - * 主键ID - */ + + // 包装ID private Integer id; - /** - * 装箱码 - */ + + // 包装编号 private String packingNo; - /** - * 装箱时间 - */ + + // 包装时间 private Date packingTime; - /** - * 装箱库内状态：0-在库，1-出库 - */ + + // 包装状态 private Integer packingStatus; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbPackingRecord.java b/src/main/java/com/xmomen/module/order/entity/TbPackingRecord.java index 38bb881..b6c0e2a 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbPackingRecord.java +++ b/src/main/java/com/xmomen/module/order/entity/TbPackingRecord.java @@ -12,29 +12,24 @@ import javax.persistence.Version; @Entity @Table(name = "tb_packing_record") public class TbPackingRecord extends BaseMybatisModel { - /** - * 主键ID - */ + + // 包装记录ID private Integer id; - /** - * 商品条码 - */ + + // 商品编码 private String upc; - /** - * 订单商品ID - */ + + // 订单项ID private Integer orderItemId; - /** - * 扫描时间 - */ + + // 扫描时间 private Date scanTime; - /** - * 装箱ID - */ + + // 包装ID private Integer packingId; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbPurchase.java b/src/main/java/com/xmomen/module/order/entity/TbPurchase.java index b439f49..161656a 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbPurchase.java +++ b/src/main/java/com/xmomen/module/order/entity/TbPurchase.java @@ -13,59 +13,48 @@ import javax.persistence.Version; @Entity @Table(name = "tb_purchase") public class TbPurchase extends BaseMybatisModel { - /** - * 主键ID - */ + + // 购买ID private Integer id; - /** - * 采购单编号 - */ + + // 购买编号 private String purchaseCode; - /** - * 产品代码 - */ + + // 商品编号 private String itemCode; - /** - * 采购总数量 - */ + + // 总金额 private BigDecimal total; - /** - * 创建时间 - */ + + // 创建日期 private Date createDate; - /** - * 采购人员ID - */ + + // 买家ID private Integer buyerId; - /** - * 采购总重量 - */ + + // 总重量 private BigDecimal totalWeight; - /** - * 分配数量 - */ + + // 配送值 private Integer distributeValue; - /** - * 已包装数 - */ + + // 包装值 private Integer packageValue; - /** - * 已装箱数 - */ + + // 包装值 private Integer packingValue; - /** - * 采购状态：0-待采购，1-已采购 - */ + + // 购买状态 private Integer purchaseStatus; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbReturnOrder.java b/src/main/java/com/xmomen/module/order/entity/TbReturnOrder.java index f66b7ca..01c0249 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbReturnOrder.java +++ b/src/main/java/com/xmomen/module/order/entity/TbReturnOrder.java @@ -13,64 +13,52 @@ import javax.persistence.Version; @Entity @Table(name = "tb_return_order") public class TbReturnOrder extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键ID private Integer id; - /** - * 订单编号 - */ + + // 订单号 private String orderNo; - /** - * 退货时间 - */ + + // 退货时间 private Date returnTime; - /** - * 订单退货状态(10-申请退货，11-退货中，14-退货运输中，15-退货完成） - */ + + // 退货状态 private Integer returnStatus; - /** - * 审核状态（0-不同意，1-同意） - */ + + // 审核状态 private Integer auditStatus; - /** - * 审核时间 - */ + + // 审核日期 private Date auditDate; - /** - * 审核人 - */ + + // 审核用户ID private Integer auditUserId; - /** - * 拿货时间 - */ + + // 取货日期 private Date takeGoodsDate; - /** - * 拿货人 - */ + + // 取货用户ID private Integer takeGoodsUserId; - /** - * 拿货人手机号 - */ + + // 取货电话 private String takeGoodsPhone; - /** - * 退款金额 - */ + + // 退货总金额 private BigDecimal returnTotalAmount; - /** - * 0-正常退货，1-超时退货， - */ + + // 是否正常 private Integer isNormal; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java index 1aaec2d..337e4e2 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java +++ b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java @@ -11,34 +11,28 @@ import javax.persistence.Version; @Entity @Table(name = "tb_return_order_item") public class TbReturnOrderItem extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键id private Integer id; - /** - * 退货订单表主键 - */ + + // 退货订单id private Integer returnOrderId; - /** - * 商品代码 - */ + + // 商品编码 private String itemCode; - /** - * 商品退货数量 - */ + + // 商品数量 private Integer itemNumber; - /** - * 商品名称 - */ + + // 商品名称 private String itemName; - /** - * 0-不需要 1-需要 - */ + + // 是否需要 private Integer isNeed; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java b/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java index 22c17b6..86c9eb2 100644 --- a/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java +++ b/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java @@ -13,39 +13,32 @@ import javax.persistence.Version; @Entity @Table(name = "tb_trade_record") public class TbTradeRecord extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键id private Integer id; - /** - * 交易金额 - */ + + // 交易金额 private BigDecimal amount; - /** - * 交易单号 - */ + + // 交易号 private String tradeNo; - /** - * 交易时间 - */ + + // 创建时间 private Date createTime; - /** - * 交易类型：cash-现金，card-卡券,recharge-充值，adjustment-卡余额调整 - */ + + // 交易类型 private String tradeType; - /** - * 备注 - */ + + // 备注 private String remark; - /** - * 记录人 - */ + + // 记录用户 private Integer recordUser; @Column(name = "ID") diff --git a/src/main/java/com/xmomen/module/order/model/CreateOrder.java b/src/main/java/com/xmomen/module/order/model/CreateOrder.java index 9d359f6..337024d 100644 --- a/src/main/java/com/xmomen/module/order/model/CreateOrder.java +++ b/src/main/java/com/xmomen/module/order/model/CreateOrder.java @@ -11,134 +11,116 @@ import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; -/** - * Created by Jeng on 16/4/5. - */ + public @Data class CreateOrder implements Serializable { - /** - * 1-卡，2-劵，3-常规 - */ + + // 订单类型 @NotNull private Integer orderType; - /** - * 批量下单数 - */ + + // 批量编号 private Integer batchNumber; - /** - * 订单编号 - */ + + // 订单编号 private String orderNo; + // 批量编号 private String batchNo; - /** - * 1-微信订单，2-商城订单，3-客服下单，4-采摘订单 - */ + + // 订单来源 private Integer orderSource; - /** - * 客户名称 - */ + + // 客户名称 private String name; - /** - * 客户代码 - */ + + // 客户代码 private String memberCode; - /** - * 客户联系方式 - */ + + // 客户联系方式 private String phone; - /** - * 付款方式 - */ + + // 付款方式 @NotNull private Integer paymentMode; - /** - * 附加付款方式 - */ + + // 附加付款方式 private Integer otherPaymentMode; - /** - * 支付关系编号（卡号/券号） - */ + + // 支付关系编号 private String paymentRelationNo; - /** - * 收货人手机 - */ + + // 收货人手机 @NotNull @NotBlank private String consigneePhone; - /** - * 收货人姓名 - */ + + // 收货人姓名 @NotNull @NotBlank private String consigneeName; - /** - * 收货人地址 - */ + + // 收货人地址 @NotNull @NotBlank private String consigneeAddress; - /** - * 订单备注 - */ + + // 订单备注 private String remark; - /** - * 折扣 - */ + + // 折扣 private Double discount; - /** - * 是否显示金额 - */ + + // 是否显示金额 private Integer isShowAmount; - /** - * 操作人 - */ + + // 操作人 private Integer createUserId; - /** - * 单位 - */ + + // 单位 private Integer companyId; - /** - * 客户经理 - */ + + // 客户经理 private Integer managerId; + // 预约时间 private Date appointmentTime; - /** - * 折扣金额 - */ + + // 折扣金额 private BigDecimal discountPrice; - /** - * 订单总金额（劵直接取,卡、常规订单后台在计算金额） - */ + + // 订单总金额 private BigDecimal totalPrice; @NotNull @NotEmpty + // 订单明细列表 private List orderItemList; public static class OrderItem implements Serializable { + // 订单明细ID @NotNull private Integer orderItemId; + // 订单明细数量 @NotNull private BigDecimal itemQty; diff --git a/src/main/java/com/xmomen/module/order/model/CreatePacking.java b/src/main/java/com/xmomen/module/order/model/CreatePacking.java index a439f96..b94bfc0 100644 --- a/src/main/java/com/xmomen/module/order/model/CreatePacking.java +++ b/src/main/java/com/xmomen/module/order/model/CreatePacking.java @@ -3,9 +3,7 @@ package com.xmomen.module.order.model; import javax.validation.constraints.NotNull; import java.io.Serializable; -/** - * Created by Jeng on 16/4/5. - */ + public class CreatePacking implements Serializable { // 订单号 diff --git a/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java b/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java index 14c12a0..6beb5e8 100644 --- a/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java +++ b/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java @@ -8,9 +8,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Map; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class CreatePackingRecord implements Serializable { // 商品编码 @NotNull diff --git a/src/main/java/com/xmomen/module/order/model/CreatePurchase.java b/src/main/java/com/xmomen/module/order/model/CreatePurchase.java index edb829f..ee49d74 100644 --- a/src/main/java/com/xmomen/module/order/model/CreatePurchase.java +++ b/src/main/java/com/xmomen/module/order/model/CreatePurchase.java @@ -5,9 +5,7 @@ import java.util.Date; import lombok.Data; -/** - * Created by Jeng on 2016/4/25. - */ + public @Data class CreatePurchase implements Serializable { //订单日期 private Date orderDate; diff --git a/src/main/java/com/xmomen/module/order/model/OrderItemModel.java b/src/main/java/com/xmomen/module/order/model/OrderItemModel.java index efc7967..451abee 100644 --- a/src/main/java/com/xmomen/module/order/model/OrderItemModel.java +++ b/src/main/java/com/xmomen/module/order/model/OrderItemModel.java @@ -4,35 +4,28 @@ import lombok.Data; import java.io.Serializable; -/** - * Created by Jeng on 16/4/6. - */ + public @Data class OrderItemModel implements Serializable { - /** - * 订单编码 - */ + + // 订单号 private String orderNo; - /** - * 商品名称 - */ + + // 商品名称 private String itemName; - /** - * 商品编号 - */ + + // 商品编码 private String itemCode; - /** - * 订单商品数量 - */ + + // 商品数量 private String itemQty; - /** - * 已装箱数量 - */ + + // 包装数量 private Integer packedQty; } diff --git a/src/main/java/com/xmomen/module/order/model/OrderModel.java b/src/main/java/com/xmomen/module/order/model/OrderModel.java index 9faf5d7..1bccf96 100644 --- a/src/main/java/com/xmomen/module/order/model/OrderModel.java +++ b/src/main/java/com/xmomen/module/order/model/OrderModel.java @@ -7,194 +7,164 @@ import java.util.List; import lombok.Data; -/** - * Created by Jeng on 16/4/6. - */ + public @Data class OrderModel implements Serializable { - /** - * 订单ID - */ + + //订单ID private Integer id; - /** - * 订单类型 - */ + + //订单类型 private Integer orderType; - /** - * 订单类型描述 - */ + + //订单类型描述 private String orderTypeDesc; - /** - * 下单人客户ID - */ + + //会员编码 private String memberCode; - /** - * 订单来源：1-微信订单，2-商城订单，3-客服下单，4-采摘订单 - */ + + //订单来源 private Integer orderSource; - /** - * 订单来源描述 - */ + + //订单来源描述 private String orderSourceDesc; - /** - * 付款方式 - */ + + //支付方式 private Integer paymentMode; - /** - * 付款方式描述 - */ + + //支付方式描述 private String paymentModeDesc; - /** - * 订单编码 - */ + + //订单号 private String orderNo; - /** - * 订单状态 - */ + + //订单状态 private String orderStatus; - /** - * 装箱任务负责人名称 - */ + + //打包任务用户名 private String packingTaskUsername; - /** - * 装箱任务负责人ID - */ + + //打包任务用户ID private Integer packingTaskUserId; - /** - * 订单装箱任务状态 - */ + //打包任务状态 private Integer packingTaskStatus; - /** - * 装箱任务状态描述 - */ + + //打包任务状态描述 private String packingTaskStatusDesc; - /** - * 装箱任务分配时间 - */ + + //打包任务创建时间 private Date packingTaskCreateTime; - /** - * 装箱任务开始时间 - */ + + //打包任务开始时间 private Date packingTaskStartTime; - /** - * 装箱任务完成时间 - */ + + //打包任务结束时间 private Date packingTaskEndTime; - /** - * 订单状态描述 - */ + + //订单状态描述 private String orderStatusDesc; - /** - * 收货人手机 - */ + + //收货人电话 private String consigneePhone; - /** - * 收货人姓名 - */ + + //收货人姓名 private String consigneeName; - /** - * 收货人地址 - */ + + //收货人地址 private String consigneeAddress; - /** - * 运送方式 1-快递，2-自提 - */ + + //运输方式 private Integer transportMode; - /** - * 订单备注 - */ + + //备注 private String remark; - /** - * 折扣价 - */ + + //折扣价格 private BigDecimal discountPrice; - /** - * 订单总金额 - */ + + //总金额 private BigDecimal totalAmount; - /** - * 订单创建时间 - */ + + //创建时间 private Date createTime; - /** - * 订单创建人ID - */ + + //创建用户ID private Integer createUserId; + //创建用户 private String createUser; - /** - * 配送时间 - */ + + //预约时间 private Date appointmentTime; - /** - * 支付卡（券）号 - */ + + //优惠券号 private String couponNumber; - /** - * 快递商 - */ + + //快递名称 private String expressName; + //发货快递ID private Integer despatchExpressId; - /** - * 项目经理 - */ + + //经理姓名 private String managerName; - /** - * 单位 - */ + + //公司名称 private String companyName; - /** - * 总箱数 - */ + + //打包模型列表 private List packingModels; + //批次号 private String batchNo; //每批次的订单数 private int batchNum; + //下架 private int xiajia; - /** - * 付款方式 - */ + + //其他支付方式 private Integer otherPaymentMode; + //其他支付方式描述 private String otherPaymentModeDesc; + //其他支付金额 private BigDecimal otherPayAmount; + //收货码 private String receivingCode; } diff --git a/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java b/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java index e5b2394..dac33f0 100644 --- a/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java +++ b/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java @@ -3,9 +3,7 @@ package com.xmomen.module.order.model; import java.io.Serializable; import java.math.BigDecimal; -/** - * Created by Jeng on 2016/4/25. - */ + public class OrderPurchaseModel implements Serializable { // 订单号 diff --git a/src/main/java/com/xmomen/module/order/model/OrderQuery.java b/src/main/java/com/xmomen/module/order/model/OrderQuery.java index 87caa0a..f15955f 100644 --- a/src/main/java/com/xmomen/module/order/model/OrderQuery.java +++ b/src/main/java/com/xmomen/module/order/model/OrderQuery.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -/** - * Created by Jeng on 2016/5/19. - */ + public @Data class OrderQuery implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingModel.java b/src/main/java/com/xmomen/module/order/model/PackingModel.java index db53a93..1d24c44 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingModel.java +++ b/src/main/java/com/xmomen/module/order/model/PackingModel.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -/** - * Created by Jeng on 16/4/6. - */ + public @Data class PackingModel implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingOrderItemModel.java b/src/main/java/com/xmomen/module/order/model/PackingOrderItemModel.java index 894f6e9..ecb6c71 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingOrderItemModel.java +++ b/src/main/java/com/xmomen/module/order/model/PackingOrderItemModel.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class PackingOrderItemModel implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingOrderModel.java b/src/main/java/com/xmomen/module/order/model/PackingOrderModel.java index 7bbdee0..f75422c 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingOrderModel.java +++ b/src/main/java/com/xmomen/module/order/model/PackingOrderModel.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class PackingOrderModel implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingOrderQuery.java b/src/main/java/com/xmomen/module/order/model/PackingOrderQuery.java index 7fe9025..448e978 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingOrderQuery.java +++ b/src/main/java/com/xmomen/module/order/model/PackingOrderQuery.java @@ -4,9 +4,7 @@ import lombok.Data; import java.io.Serializable; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class PackingOrderQuery implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingQuery.java b/src/main/java/com/xmomen/module/order/model/PackingQuery.java index ee693d9..a2bb06a 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingQuery.java +++ b/src/main/java/com/xmomen/module/order/model/PackingQuery.java @@ -6,9 +6,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -/** - * Created by Jeng on 16/4/6. - */ + public @Data class PackingQuery implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java b/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java index ebca723..c63c632 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java +++ b/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java @@ -5,39 +5,31 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class PackingRecordModel implements Serializable { - /** - * ID - */ + + // 包装记录ID private Integer id; - /** - * 商品条码 - */ + + // 商品UPC编码 private String upc; - /** - * 扫描时间 - */ + + // 扫描时间 private Date scanTime; - /** - * 装箱ID - */ + + // 包装ID private Integer packingId; - /** - * 装箱编号 - */ + + // 包装编号 private String packingNo; - /** - * 商品名称 - */ + + // 商品名称 private String itemName; diff --git a/src/main/java/com/xmomen/module/order/model/PackingRecordQuery.java b/src/main/java/com/xmomen/module/order/model/PackingRecordQuery.java index 3bc2132..b027a19 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingRecordQuery.java +++ b/src/main/java/com/xmomen/module/order/model/PackingRecordQuery.java @@ -5,14 +5,11 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -/** - * Created by Jeng on 2016/5/21. - */ + public @Data class PackingRecordQuery implements Serializable { - /** - * ID - */ + + // 包装记录ID private Integer id; // 关键字 diff --git a/src/main/java/com/xmomen/module/order/model/PackingTask.java b/src/main/java/com/xmomen/module/order/model/PackingTask.java index ac8f6b6..2af6b1a 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingTask.java +++ b/src/main/java/com/xmomen/module/order/model/PackingTask.java @@ -7,21 +7,17 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; -/** - * Created by Jeng on 16/5/25. - */ + public @Data class PackingTask implements Serializable { - /** - * 订单号集合 - */ + + // 订单号列表 @NotNull @NotEmpty private List orderNos; - /** - * 装箱任务负责人ID - */ + + // 包装任务用户ID @NotNull private Integer packingTaskUserId; diff --git a/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java b/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java index 4bdb73a..5bb6a89 100644 --- a/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java +++ b/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java @@ -4,9 +4,7 @@ import lombok.Data; import java.io.Serializable; -/** - * Created by tanxinzheng on 16/6/13. - */ + public @Data class PackingTaskCount implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PayOrder.java b/src/main/java/com/xmomen/module/order/model/PayOrder.java index aefa9b5..624d4b2 100644 --- a/src/main/java/com/xmomen/module/order/model/PayOrder.java +++ b/src/main/java/com/xmomen/module/order/model/PayOrder.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * Created by Jeng on 2016/5/18. - */ + public @Data class PayOrder implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/PurchaseModel.java b/src/main/java/com/xmomen/module/order/model/PurchaseModel.java index 0cd9f4d..3f81e9f 100644 --- a/src/main/java/com/xmomen/module/order/model/PurchaseModel.java +++ b/src/main/java/com/xmomen/module/order/model/PurchaseModel.java @@ -8,9 +8,7 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -/** - * Created by Jeng on 2016/4/25. - */ + public @Data class PurchaseModel implements Serializable { diff --git a/src/main/java/com/xmomen/module/order/model/RefundOrder.java b/src/main/java/com/xmomen/module/order/model/RefundOrder.java index 3876c02..38819d7 100644 --- a/src/main/java/com/xmomen/module/order/model/RefundOrder.java +++ b/src/main/java/com/xmomen/module/order/model/RefundOrder.java @@ -5,9 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -/** - * Created by tanxinzheng on 16/6/27. - */ + public @Data class RefundOrder implements Serializable{ diff --git a/src/main/java/com/xmomen/module/order/model/ReturnOrder.java b/src/main/java/com/xmomen/module/order/model/ReturnOrder.java index 562441f..82be4c4 100644 --- a/src/main/java/com/xmomen/module/order/model/ReturnOrder.java +++ b/src/main/java/com/xmomen/module/order/model/ReturnOrder.java @@ -6,9 +6,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.List; -/** - * Created by tanxinzheng on 16/8/17. - */ + public @Data class ReturnOrder implements Serializable { // 订单号 diff --git a/src/main/java/com/xmomen/module/order/model/ScanModel.java b/src/main/java/com/xmomen/module/order/model/ScanModel.java index 7c71128..a4bd43a 100644 --- a/src/main/java/com/xmomen/module/order/model/ScanModel.java +++ b/src/main/java/com/xmomen/module/order/model/ScanModel.java @@ -5,43 +5,34 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -/** - * Created by tanxinzheng on 16/8/8. - */ + @Data public class ScanModel implements Serializable { - /** - * 订单号 - */ + + // 订单号 private String orderNo; - /** - * 任务状态 - */ + + // 任务状态 private Integer taskStatus; - /** - * ID - */ + + // id private Integer id; - /** - * 商品条码 - */ + + // upc private String upc; - /** - * 订单商品ID - */ + + // 订单项id private Integer orderItemId; - /** - * 扫描时间 - */ + + // 扫描时间 private Date scanTime; - /** - * 装箱ID - */ + + // 包装id private Integer packingId; } diff --git a/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java b/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java index ecd3cf5..5bfec2a 100644 --- a/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java +++ b/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java @@ -7,40 +7,33 @@ import java.util.Date; import lombok.Data; public @Data class TradeRecordModel implements Serializable{ - /** - * 主键 - */ + + // 交易记录ID private Integer id; - /** - * 交易金额 - */ + + // 交易金额 private BigDecimal amount; - /** - * 交易单号 - */ + + // 交易编号 private String tradeNo; - /** - * 交易时间 - */ + + // 创建时间 private Date createTime; - /** - * 交易类型：cash-现金，card-卡券,recharge-充值，adjustment-卡余额调整 - */ + + // 交易类型 private String tradeType; - /** - * 备注 - */ + // 备注 private String remark; - /** - * 记录人 - */ + + // 记录用户ID private Integer recordUser; + // 记录用户名称 private String recordUserName; } diff --git a/src/main/java/com/xmomen/module/order/model/UpdateOrder.java b/src/main/java/com/xmomen/module/order/model/UpdateOrder.java index 08971e2..d713d15 100644 --- a/src/main/java/com/xmomen/module/order/model/UpdateOrder.java +++ b/src/main/java/com/xmomen/module/order/model/UpdateOrder.java @@ -12,9 +12,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * Created by Jeng on 16/4/5. - */ + public @Data class UpdateOrder implements Serializable { // 订单编号 diff --git a/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java b/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java index 0722ce5..4635a07 100644 --- a/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java +++ b/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java @@ -15,106 +15,76 @@ import com.xmomen.module.order.model.CreateOrder.OrderItem; import lombok.Data; public @Data class WxCreateOrder implements Serializable { - /** - * 0-常规订单，1-卡，2-劵，3-餐桌计划订单 - */ + + // 订单类型，默认为0 @NotNull private Integer orderType = 0; - /** - * 订单编号 - */ + private String orderNo; - /** - * 1-微信订单，2-商城订单，3-客服下单，4-采摘订单 - */ + private Integer orderSource = 1; - /** - * 客户名称 - */ + private String name; - /** - * 客户代码 - */ + private String memberCode; - /** - * 客户联系方式 - */ + private String phone; - /** - * 付款方式 - */ + private Integer paymentMode; - /** - * 附加付款方式 - */ + private Integer otherPaymentMode; - /** - * 支付关系编号（卡号/券号） - */ + private String paymentRelationNo; - /** - * 收货人手机 - */ + // 收货人电话，不能为空 @NotNull @NotBlank private String consigneePhone; - /** - * 收货人姓名 - */ + + // 收货人姓名，不能为空 @NotNull @NotBlank private String consigneeName; - /** - * 收货人地址 - */ + + // 收货人地址，不能为空 @NotNull @NotBlank private String consigneeAddress; - /** - * 订单备注 - */ + private String remark; - /** - * 折扣 - */ + private Integer discount; - /** - * 操作人 - */ + private Integer createUserId; private Date appointmentTime; - /** - * 折扣金额 - */ + private BigDecimal discountPrice; - /** - * 订单总金额（劵直接取,卡、常规订单后台在计算金额） - */ + private BigDecimal totalPrice; - /** - * 券的物品直接从后台获取 - */ + private List orderItemList; + // 订单项 public static class OrderItem implements Serializable { + // 订单项ID，不能为空 @NotNull private Integer orderItemId; + // 订单项数量，不能为空 @NotNull private BigDecimal itemQty;