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

Compare commits

base: angelo:330d7acfbb1233890647cfdbd23378aad60b3c0b
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:6860d3359b3e8cd1d9731f1fd626812047e7ba31
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "330d7acfbb1233890647cfdbd23378aad60b3c0b" and "6860d3359b3e8cd1d9731f1fd626812047e7ba31" have entirely different histories.
330d7acfbb ... 6860d3359b

2 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -616,7 +616,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
RetailOrderRegisterParam registerParam = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_REG_PARAM + pkMember + orderCode);
boolean isShared = ObjectUtil.isNotEmpty(registerParam) && ObjectUtil.isNotEmpty(registerParam.getCuMemberShare());
boolean isShared = ObjectUtil.isNotEmpty(registerParam.getCuMemberShare());
if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType()
|| (isShared && EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType())
) {

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -1154,10 +1154,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderChargeLogService.save(saOrderChargeLog);
// 撤销注册订单
CuMember member = memberServiceApi.getMember(myOrderVO.getPkMember()).getData();
if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()
|| (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && myOrderVO.getPayTime().equals(member.getPayTime()))
) {
if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()) {
// 逻辑删除会员
if (!memberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
throw new ServiceException("撤单失败");