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

## 2025.05.30补全北大到乐学合并问题；

This commit is contained in:
cabbage 2025-05-30 09:55:44 +08:00
parent c0c9196874
commit 496a6e8dc2
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,10 +247,6 @@ public class SaDeliverSecondController extends BaseController {
// 扣款比例不能大于 100% // 扣款比例不能大于 100%
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DEDUCT_RATIO_NOT_MORE_THAN) + "100%"); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DEDUCT_RATIO_NOT_MORE_THAN) + "100%");
} }
if (deductRatio.compareTo(new BigDecimal("100")) < 0 && !zeroRatio) {
// 配置扣款比例不足 100%
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DEDUCT_RATIO_NOT_ENOUGH) + "100%");
}
} }
String str = iSaDeliverBusinessService.secondDeliverSubmit(param, userTokenService.getLoginUser()); String str = iSaDeliverBusinessService.secondDeliverSubmit(param, userTokenService.getLoginUser());

29
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
View File

@ -26,33 +26,11 @@ public enum ESpecialArea {
*/ */
REPURCHASE_AREA(3, "复购自营", 0, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()), REPURCHASE_AREA(3, "复购自营", 0, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()),
// /**
// * 云代注册专区
// */
// CLOUD_REGISTER_AREA(4, "云代注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "4"),
//
// /**
// * 云代升级专区
// */
// CLOUD_UPGRADE_AREA(5, "云代升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "5"),
//
// /**
// * 云代复购专区
// */
// CLOUD_REPURCHASE_AREA(6, "云代复购专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "6"),
//
// /**
// * 海粉专区
// */
// FANS_AREA(7, "海粉专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "7", 2, EMenuDetail.FANS.getValue()),
/** /**
* 提货专区 * 提货专区
*/ */
CARRY_GOODS_AREA(8, "提货专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 8, 11, EMenuDetail.PICK.getValue()), CARRY_GOODS_AREA(8, "提货专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 8, 11, EMenuDetail.PICK.getValue()),
// /**
// * 礼包专区
// */
// GIFT_AREA(9, "礼包专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 9, 12, -1),
/** /**
* 重消专区 * 重消专区
*/ */
@ -83,6 +61,11 @@ public enum ESpecialArea {
*/ */
RENEWAL_AREA(30, "续约专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 30, 30, EMenuDetail.RENEWAL_AREA.getValue()), RENEWAL_AREA(30, "续约专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 30, 30, EMenuDetail.RENEWAL_AREA.getValue()),
/**
* 自助购票
*/
RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1),
; ;
/** /**