angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(SaOrder): 订单详情添加架构字段

This commit is contained in:
woody 2025-08-11 17:48:01 +08:00 committed by cabbage
parent 242d132db8
commit 81abe907fc
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
View File

@ -235,6 +235,8 @@ public class SaOrderController extends ParentOrderController {
if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) { if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope()))); waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
} }
// 商品类型
waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
// 发货类型 // 发货类型
waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel())); waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel()));
// 计算产品总计 // 计算产品总计

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
View File

@ -345,4 +345,10 @@ public class WaresOrderVo implements Serializable {
*/ */
@Excel(name = "订单套数") @Excel(name = "订单套数")
private Integer boxNum; private Integer boxNum;
/**
* 商品类型
*/
private Integer isMakerGift;
private String isMakerGiftVal;
} }

1
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
View File

@ -756,6 +756,7 @@
bw.WARES_NAME commodityName, bw.WARES_NAME commodityName,
oi.WARES_QUANTITY waresQuantity, oi.WARES_QUANTITY waresQuantity,
oi.SKU_CODE skuCode, oi.SKU_CODE skuCode,
oi.IS_MAKER_GIFT isMakerGift,
ver.VERTEX_NAME vertexName ver.VERTEX_NAME vertexName
from sa_order_items oi from sa_order_items oi
left join sa_order so on oi.PK_ORDER = so.PK_ID left join sa_order so on oi.PK_ORDER = so.PK_ID