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

Compare commits

base: angelo:2a92a633783705d4ab9b842f38be44acb74f75bc
Branches Tags
angelo:master
angelo:bd_test
angelo:bd_dev
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx_test
angelo:lx_dev
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:84e54d0236f742c1989f2f5fdafe5b2869818bc6
Branches Tags
angelo:bd_test
angelo:bd_dev
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx_test
angelo:lx_dev
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "2a92a633783705d4ab9b842f38be44acb74f75bc" and "84e54d0236f742c1989f2f5fdafe5b2869818bc6" have entirely different histories.
2a92a63378 ... 84e54d0236

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

15
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java
View File

@ -125,6 +125,16 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type)); oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type));
oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type)); oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type));
break; break;
case SPECIAL_REGISTER_ORDER:
// 乐学注册订单
oldSo.setSpecialRegisterAmount(addOrInitializeAmount(oldSo.getSpecialRegisterAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialRegisterPv(addOrInitializeAmount(oldSo.getSpecialRegisterPv(), newSo.getOrderAchieve(), type));
break;
case SPECIAL_UPGRADE_ORDER:
// 乐学升级订单
oldSo.setSpecialUpgradeAmount(addOrInitializeAmount(oldSo.getSpecialUpgradeAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialUpgradePv(addOrInitializeAmount(oldSo.getSpecialUpgradePv(), newSo.getOrderAchieve(), type));
break;
// 复购 // 复购
case REPURCHASE_ORDER: case REPURCHASE_ORDER:
case CONSUME_ORDER: case CONSUME_ORDER:
@ -133,6 +143,11 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type)); oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type)); oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
break; break;
case SPECIAL_REPURCHASE_ORDER:
// 乐学复购订单
oldSo.setSpecialRepurchaseAmount(addOrInitializeAmount(oldSo.getSpecialRepurchaseAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialRepurchasePv(addOrInitializeAmount(oldSo.getSpecialRepurchasePv(), newSo.getOrderAchieve(), type));
break;
default: default:
break; break;
} }

15
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java
View File

@ -260,6 +260,16 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type)); oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type));
oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type)); oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type));
break; break;
case SPECIAL_REGISTER_ORDER:
// 乐学注册订单
oldSo.setSpecialRegisterAmount(addOrInitializeAmount(oldSo.getSpecialRegisterAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialRegisterPv(addOrInitializeAmount(oldSo.getSpecialRegisterPv(), newSo.getOrderAchieve(), type));
break;
case SPECIAL_UPGRADE_ORDER:
// 乐学升级订单
oldSo.setSpecialUpgradeAmount(addOrInitializeAmount(oldSo.getSpecialUpgradeAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialUpgradePv(addOrInitializeAmount(oldSo.getSpecialUpgradePv(), newSo.getOrderAchieve(), type));
break;
// 复购 // 复购
case REPURCHASE_ORDER: case REPURCHASE_ORDER:
case CONSUME_ORDER: case CONSUME_ORDER:
@ -268,6 +278,11 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type)); oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type)); oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
break; break;
case SPECIAL_REPURCHASE_ORDER:
// 乐学复购订单
oldSo.setSpecialRepurchaseAmount(addOrInitializeAmount(oldSo.getSpecialRepurchaseAmount(), newSo.getOrderAmount(), type));
oldSo.setSpecialRepurchasePv(addOrInitializeAmount(oldSo.getSpecialRepurchasePv(), newSo.getOrderAchieve(), type));
break;
default: default:
break; break;
} }