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

Compare commits

base: angelo:80f27bbec834c0dc4e4f3a9d7948ea18b8f20fd9
Branches Tags
angelo:master
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:cbb79e959e7ac1fccbce822ef50ecdc370093679
Branches Tags
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "80f27bbec834c0dc4e4f3a9d7948ea18b8f20fd9" and "cbb79e959e7ac1fccbce822ef50ecdc370093679" have entirely different histories.
80f27bbec8 ... cbb79e959e

4 changed files with 4 additions and 12 deletions
Show Stats 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,8 +301,6 @@ public class SaOrderController extends ParentOrderController {
if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
}
// 商品类型
waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
// 发货类型
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,13 +292,6 @@ public class WaresOrderInfoVo implements Serializable {
*/
private Integer systemType;
/**
* 商品类型
*/
private Integer isMakerGift;
@Excel(name = "商品类型")
private String isMakerGiftVal;
/**
* 创建时间
*/

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

@ -771,11 +771,11 @@
left join sa_order so on oi.PK_ORDER = so.PK_ID
left join cu_member m on m.PK_ID = so.PK_CREATOR
left join cu_member cm on cm.PK_ID = so.PK_MEMBER
left join bd_vertex ver on ver.PK_ID = cm.PK_VERTEX and ver.del_flag = 0
left join bd_vertex ver on ver.PK_ID = cm.PK_VERTEX
left join bd_wares_extend we on we.PK_WARES = oi.PK_WARES
left join bd_wares bw on bw.PK_ID = we.PK_WARES
left join bd_product bp on bp.PK_ID = oi.PK_PRODUCT
where oi.del_flag = 0 and so.del_flag = 0
where oi.del_flag = 0 and so.del_flag = 0 and ver.del_flag = 0
<if test="addPurchaseFlag != null and addPurchaseFlag == 0">
and oi.pk_order in (
select distinct soi.pk_order

3
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -658,8 +658,9 @@
from sa_order so
left join CU_MEMBER cm on cm.PK_ID = so.PK_MEMBER
left join CU_MEMBER m on m.PK_ID = so.PK_CREATOR
left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX and ver.DEL_FLAG = 0
left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX
where so.DEL_FLAG = 0
and ver.DEL_FLAG = 0
<if test="addPurchaseFlag != null and addPurchaseFlag == 0">
and so.PK_ID in (
select distinct soi.pk_order