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

Compare commits

base: angelo:1f012e2c5d3b912e01813f8a63a4e62a4dd1d212
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:5d47ccf7a5c4e8db24521a2b79179f38278cca72
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. "1f012e2c5d3b912e01813f8a63a4e62a4dd1d212" and "5d47ccf7a5c4e8db24521a2b79179f38278cca72" have entirely different histories.
1f012e2c5d ... 5d47ccf7a5

3 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
View File

@ -34,7 +34,7 @@
assess_type NUMBER(2) not null, assess_type NUMBER(2) not null,
pk_awards NUMBER(6) default 1 not null, pk_awards NUMBER(6) default 1 not null,
assess_target NUMBER(17,6) default 0 not null, assess_target NUMBER(17,6) default 0 not null,
assess_pk_awards NUMBER(6) default 1 not null, assess_pk_awards NUMBER(6) default 1 not null,,
is_examine NUMBER(1) default 1 not null, is_examine NUMBER(1) default 1 not null,
assess_status NUMBER(2) not null, assess_status NUMBER(2) not null,
month_balance NUMBER(17,6) default 0 not null, month_balance NUMBER(17,6) default 0 not null,

8
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
View File

@ -106,10 +106,6 @@ public class SaDeliverUnhandledController extends BaseController {
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList());
param.setTeamList(userAuthorityDTO.getUserTeamList()); param.setTeamList(userAuthorityDTO.getUserTeamList());
// 兼容调换货产品
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
param.setPkWaresList(Collections.singletonList(0));
}
startPage(); startPage();
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry); List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
@ -153,10 +149,6 @@ public class SaDeliverUnhandledController extends BaseController {
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList());
param.setTeamList(userAuthorityDTO.getUserTeamList()); param.setTeamList(userAuthorityDTO.getUserTeamList());
// 兼容调换货产品
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
param.setPkWaresList(Collections.singletonList(0));
}
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry); List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);

6
bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
View File

@ -119,7 +119,7 @@
from sa_order so from sa_order so
where so.del_flag = 0 where so.del_flag = 0
and so.order_status = 1 and so.order_status = 1
and so.order_type in (3, 14, 26, 10) and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm-dd') = and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate, 'yyyy-mm-dd') to_char(sysdate, 'yyyy-mm-dd')
) b on 1 = 1 ) b on 1 = 1
@ -141,7 +141,7 @@
from sa_order so from sa_order so
where so.del_flag = 0 where so.del_flag = 0
and so.order_status = 1 and so.order_status = 1
and so.order_type in (3, 14, 26, 10) and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm-dd') = and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate - 1, 'yyyy-mm-dd') to_char(sysdate - 1, 'yyyy-mm-dd')
) b on 1 = 1 ) b on 1 = 1
@ -165,7 +165,7 @@
from sa_order so from sa_order so
where so.del_flag = 0 where so.del_flag = 0
and so.order_status = 1 and so.order_status = 1
and so.order_type in (3, 14, 26, 10) and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm') = and to_char(so.pay_time, 'yyyy-mm') =
to_char(sysdate, 'yyyy-mm') to_char(sysdate, 'yyyy-mm')
) b on 1 = 1 ) b on 1 = 1