diff --git a/docs/change-0410.md b/docs/change-0410.md index 979fe37..c946722 100644 --- a/docs/change-0410.md +++ b/docs/change-0410.md @@ -7,11 +7,13 @@ - **已修复**不改变平台端管理后台原有的订单管理功能页 - **已修复**在平台端管理后台左侧的订单目录下加入移植过来的功能页面菜单 + ## 订单相关 - **已修复**1. 新增“订单打印”功能,点击订单打印按钮(不同于打印小票),新打开一个订单详情(含商品信息,收货信息)的单独页面(不需要页面layout),点击页面上的“打印”按钮,可以直接使用浏览器打印 - **已修复**2. 订单打印详情页中的商品相关信息使用eb_sync_order_detail_staging中的product_name,info字段的商品详细信息 + ## 测试问题(平台管理后台) - **已修复**商户订单页面(order/merchantList)点击详情等按钮提示“订单不存在” diff --git a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java index 8fc9178..d3ecc4d 100644 --- a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java +++ b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java @@ -82,6 +82,9 @@ public class MerchantOrderPageResponse implements Serializable { @ApiModelProperty(value = "订单商品总数") private Integer totalNum; + @ApiModelProperty(value = "使用积分") + private Integer useIntegral; + @ApiModelProperty(value = "商户备注") private String merchantRemark; diff --git a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml index 9fefe49..df4bd6f 100644 --- a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml +++ b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml @@ -124,7 +124,7 @@