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

## 订单详情导出添加商品类型；

This commit is contained in:
cabbage 2025-08-27 09:05:59 +08:00
parent eaa1f6f80d
commit 80f27bbec8
2 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

@ -301,6 +301,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()));
} }

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
View File

@ -292,6 +292,13 @@ public class WaresOrderInfoVo implements Serializable {
*/ */
private Integer systemType; private Integer systemType;
/**
* 商品类型
*/
private Integer isMakerGift;
@Excel(name = "商品类型")
private String isMakerGiftVal;
/** /**
* 创建时间 * 创建时间
*/ */