diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 33e596be..ba334958 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -454,8 +454,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { iCuMemberTreeService.updateCuMemberSettle(cuMemberAchieveHashMap, currentSettleTableName); // 实际处理数据方法（计算奖衔） iCuMemberAwardsService.calculateCuMemberAwards(settleDate, awardsMap, currentSettleTableName); - // TODO new 乐学，处理V3 V4的升级 - iCuMemberLevelService.calculateCuMemberGrade(settleDate, currentSettleTableName); + // 2025.04.23 调整需求，乐学升级不需要处理结算套数处理 -- new 乐学，处理V3 V4的升级 +// iCuMemberLevelService.calculateCuMemberGrade(settleDate, currentSettleTableName); // 计算完奖衔回退金额、业绩、套数，最终根据新增进行回写 iCuMemberTreeService.updateCuMemberBackSettle(cuMemberAchieveHashMap, currentSettleTableName); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index b8573f7e..0e46eada 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -307,8 +307,6 @@ public class MemberServiceProvider implements IMemberServiceApi { * @param saOrder 订单信息 * @param cuMemberAccountExt 会员账户信息 * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:35 */ @Override public R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt) { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 389d50aa..89774fa9 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -299,6 +299,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { return Boolean.FALSE; } } + // 会员升级记录 saveMemberRecords(cuMember, saOrder); // 扣款信息 insertMemberTrade(saOrder, cuMemberAccountExt); diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java index 80b1da33..afb23b8d 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java @@ -758,9 +758,6 @@ public abstract class ParentOrderController extends BaseController { /* * @description: 将购物车的数量转换到sku种 - * @author: sui q - * @date: 2023/5/23 16:22 - * @param: null null **/ protected void convertShoppingCarToSku(OrderParam orderParam) { ShoppingCartVO shoppingCartVO = new ShoppingCartVO(); diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java index 969d5575..8f33b090 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java @@ -41,11 +41,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * @author: sui q - * @time: 2022/8/27 16:20 * @description: 订单控制类 - * @classname: OrderController - * @package_name: com.hzs.sale.order.controller */ @RestController @RequestMapping("/api/order") @@ -53,19 +49,17 @@ import java.util.concurrent.TimeUnit; public class ApiRegSaOrderController extends ParentOrderController { @DubboReference - IGradeServiceApi gradeServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - IAcPickServiceApi acPickServiceApi; + IAcPickServiceApi iAcPickServiceApi; @Autowired - private ISaOrderService orderService; + private ISaOrderService iSaOrderService; /** * @param orderParam 订单参数 * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/confirm-reg-order") @RepeatSubmit @@ -89,7 +83,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } orderParam.setSource(source); - if (!orderService.checkPreSalesQuantity(orderParam)) { + if (!iSaOrderService.checkPreSalesQuantity(orderParam)) { // 商品预售数量不足 return AjaxResult.error(SaOrderMsgConstants.WARES_PRE_SALE_QUANTITY_LACK); } @@ -103,6 +97,7 @@ public class ApiRegSaOrderController extends ParentOrderController { if (ObjectUtil.isNotEmpty(msg)) { return AjaxResult.error(TransactionUtils.getContent(msg)); } + // 购物车中的商品相关信息 convertShoppingCarToSku(orderParam); if (getOrderService().confirmRegSaOrderByOrderParam(orderParam)) { //删除购物车下单的数据 @@ -121,8 +116,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 订单参数 * @Description: 支付注册订单，生成支付订单或者更新待支付订单 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-reg-order") @RepeatSubmit @@ -227,9 +220,6 @@ public class ApiRegSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 * @Description: 查询订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-order") public AjaxResult queryOrder(@RequestBody OrderParam orderParam) { @@ -271,7 +261,7 @@ public class ApiRegSaOrderController extends ParentOrderController { EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) { CuMember parentCuMember = getOrderService().getCuMemberByKey(cuMember.getPkParent()); CuMember placeCuMember = getOrderService().getCuMemberByKey(cuMember.getPkPlaceParent()); - GradeDTO gradeDTO = gradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); + GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); orderReturn.setPkGrade(gradeDTO.getPkTransaction()); orderReturn.setPhone(cuMember.getPhone()); orderReturn.setParent(CommonUtil.getMemberCode(parentCuMember.getMemberCode(), parentCuMember.getServiceCode())); @@ -288,7 +278,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } else if (EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType() || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()) { getOrderService().setLastCuMemberGrade(cuMember, saOrder); - GradeDTO gradeDTO = gradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); + GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); orderReturn.setPkGrade(gradeDTO.getPkTransaction()); } } @@ -302,7 +292,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } else { orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + SecurityUtils.getUserId() + orderParam.getOrderCode()); if (orderParam.getPkGrade() != null) { - GradeDTO gradeDTO = gradeServiceApi.getGrade(orderParam.getPkGrade()).getData(); + GradeDTO gradeDTO = iGradeServiceApi.getGrade(orderParam.getPkGrade()).getData(); orderReturn.setPkGrade(gradeDTO.getPkTransaction()); } orderReturn.setMemberCode(orderParam.getMemberCode()); @@ -323,9 +313,6 @@ public class ApiRegSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 * @Description: 查询订单邮费 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-order-postage") public AjaxResult queryOrderPostage(@RequestBody OrderParam orderParam) { @@ -344,17 +331,13 @@ public class ApiRegSaOrderController extends ParentOrderController { /** * @description: 自助服务-修改收货地址邮费计算 - * @author: zhang jing - * @date: 2023/5/30 12:00 - * @param: [orderParam] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @PostMapping("/self-order-postage") public AjaxResult selfOrderPostage(@RequestBody OrderParam orderParam) { //提货订单邮费 Integer pkCountry = SecurityUtils.getPkCountry(); if (orderParam.getSpecialArea() == EOrderType.PICK_ORDER.getValue() && StringUtils.isNotEmpty(orderParam.getOrderCode())) { - R postagenew = acPickServiceApi.queryOrderPostage(orderParam.getOrderCode(), orderParam.getRecProvince(), + R postagenew = iAcPickServiceApi.queryOrderPostage(orderParam.getOrderCode(), orderParam.getRecProvince(), orderParam.getRecCity(), pkCountry); if (postagenew.getData() != null) { return AjaxResult.success(OrderReturn.builder().postage(postagenew.getData()).build()); @@ -377,8 +360,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 订单参数 * @Description: 查询订单消费明细 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:56 */ @PostMapping("/query-spend-details") public AjaxResult queryOrderSpendDetails(@RequestBody OrderParam orderParam) { @@ -429,8 +410,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 手机号、姓名 * @Description: 验证手机号+姓名 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:51 */ @Override @PostMapping("/valid-phone") @@ -443,8 +422,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 必须推荐人 * @Description: 验证推荐编号、推荐关系，成功后返回姓名,只有注册订单调用 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ @Override @PostMapping("/valid-p-code") @@ -459,8 +436,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 必须安置人 当传输的值中安置部门不为空时，校验安置位置 * @Description: 验证安置编号，成功后返回姓名 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ @Override @PostMapping("/valid-p-p-code") @@ -473,8 +448,6 @@ public class ApiRegSaOrderController extends ParentOrderController { /** * @Description: 空单注册 验证权限，验证编号是否有报单权限 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ @PostMapping("/valid-authority") public AjaxResult validateRegisterAuthority() { @@ -486,8 +459,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 参数 * @Description: 校验会员等级, 计算会员等级 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/valid-mem-level") public AjaxResult validateMemberLevel(@RequestBody OrderParam orderParam) { @@ -529,8 +500,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 参数 * @Description: 快速注册 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/quick-reg") public AjaxResult quickRegistration(@RequestBody OrderParam orderParam) { @@ -598,8 +567,6 @@ public class ApiRegSaOrderController extends ParentOrderController { * @param orderParam 参数 * @Description: 快速注册 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @PostMapping("/update-default") public AjaxResult setRegisterDefault(@RequestBody OrderParam orderParam) { @@ -613,8 +580,6 @@ public class ApiRegSaOrderController extends ParentOrderController { /** * @Description: 快速注册 * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/24 14:19 */ @GetMapping("/query-default") public AjaxResult setRegisterDefault() { diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 892d867a..05e16c78 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -201,8 +201,6 @@ public interface ISaOrderService extends IService { * * @param cuMemberAccount 会员账户 * @param saOrder 订单信息 - * @Author: sui q - * @Date: 2022/9/5 15:28 */ CuMemberAccountExt queryOrderSpendDetails(CuMemberAccountExt cuMemberAccount, SaOrder saOrder, List orderItemList); @@ -211,17 +209,11 @@ public interface ISaOrderService extends IService { * 将会员端传递过来的保单信息封装为订单信息,待支付时直接入库，直接保存时先放入redis暂存，待支付时在保存入库 * * @param orderParam 会员端的报单信息 - * @return: SaOrderExt - * @Author: sui q - * @Date: 2022/9/8 11:01 */ Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam); /* * @description: 确认嗨粉订单根据参数 - * @author: sui q - * @date: 2023/5/31 11:35 - * @param: null null **/ Boolean confirmSelfFunOrderByOrderParam(OrderParam orderParam, CuMember cuMember); @@ -230,9 +222,6 @@ public interface ISaOrderService extends IService { * * @param orderParam 前台参数 * @param cuMember 会员 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/11 11:45 */ SaOrderExt packageSaOrder(OrderParam orderParam, CuMember cuMember); @@ -240,9 +229,6 @@ public interface ISaOrderService extends IService { * 封装需要保存的销售订单和会员 * * @param orderParam 前台参数 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/11 11:45 */ CuMember packageCuMember(OrderParam orderParam); @@ -281,8 +267,6 @@ public interface ISaOrderService extends IService { * @param saOrderExt 订单信息 * @param cuMemberAccountExt 会员账户 * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 10:24 */ Boolean payUpgradeSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt); @@ -291,8 +275,6 @@ public interface ISaOrderService extends IService { * * @param orderParam 参数信息 * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 21:16 */ Boolean confirmRepurchaseSaOrder(OrderParam orderParam); @@ -302,8 +284,6 @@ public interface ISaOrderService extends IService { * @param saOrderExt 订单 * @param cuMemberAccountExt 会员账户 * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:29 */ Boolean payRepurchaseSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt); diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java index 2bb09d79..8c91d3ba 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java @@ -217,9 +217,6 @@ public class SaOrderHandle { * @param cuMember 会员 * @param saOrder 订单主表 * @param orderParam 订单商品信息 - * @Description: 封装订单标题 - * @Author: sui q - * @Date: 2022/9/8 11:04 */ void packSaOrderItems(CuMember cuMember, SaOrderExt saOrder, OrderParam orderParam) { orderParam.setPostage(BigDecimal.ZERO); @@ -238,9 +235,6 @@ public class SaOrderHandle { * @param cuMember 会员 * @param orderParam 参数 * @Description: 查询邮费 - * @return: void - * @Author: sui q - * @Date: 2022/9/21 16:21 */ List queryPostage(CuMember cuMember, OrderParam orderParam) { return getSaOrderItems(cuMember, null, orderParam); @@ -250,10 +244,7 @@ public class SaOrderHandle { * @param cuMember 会员 * @param saOrder 主表 * @param orderParam 参数 - * @Description: 因为邮费 - * @return: List 明细 - * @Author: sui q - * @Date: 2022/9/21 16:26 + * @Description: 计算邮费 */ private List getSaOrderItems(CuMember cuMember, SaOrderExt saOrder, OrderParam orderParam) { // 当前国家 @@ -285,7 +276,7 @@ public class SaOrderHandle { for (BdWaresDetailExt waresDetailExt : bdWaresDetailExtList) { SaOrderItems saOrderItems = getSaOrderItems(cuMember, saOrder, currency, saOrderItemsList, waresDetailExt); // 特殊会员产品处理 - if (saOrder != null + if (null != saOrder && EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == saOrder.getOrderType() && EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) { @@ -830,8 +821,8 @@ public class SaOrderHandle { List gradeList = gradeServiceApi.queryGradeConfigByCondition(pkCountry).getData(); if (gradeList != null && gradeList.size() > 0) { - // TODO new V1、V2是购买直接给等级，V3以上不是 - gradeList = gradeList.stream().filter(tmp -> tmp.getGradeValue() < EGrade.VIP.getValue()).collect(Collectors.toList()); +// // TODO new V1、V2是购买直接给等级，V3以上不是 +// gradeList = gradeList.stream().filter(tmp -> tmp.getGradeValue() < EGrade.VIP.getValue()).collect(Collectors.toList()); for (GradeDTO gradeDTO : gradeList) { if (validateGradeByAchieve(settleOrderAmount, settleOrderPv, gradeDTO)) { diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index beeb34cf..d98268e8 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -599,9 +599,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl * 将会员端传递过来的保单信息封装为订单信息,待支付时直接入库，直接保存时先放入redis暂存，待支付时在保存入库 * * @param orderParam 会员端的报单信息 - * @return: SaOrderExt - * @Author: sui q - * @Date: 2022/9/8 11:01 */ @Override @Transactional(rollbackFor = Exception.class) @@ -744,9 +741,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl } // 等级对应的结算值 cuMember.setConsumeMoney(saOrderExt.getOrderAmount()); - cuMember.setConsumeAchieve(saOrderExt.getOrderAchieve()); - // TODO new 注册业绩改为跟着订单走，V3 V4不能直接购买升级 -// cuMember.setConsumeAchieve(gradeDTO.getStartValue()); + cuMember.setConsumeAchieve(gradeDTO.getStartValue()); if (cuMember.getRegisterAuthority() == null || cuMember.getRegisterAuthority() < gradeDTO.getRegisterAuthority()) { cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority()); } @@ -898,7 +893,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl newCuMember.setCreationTime(currentDateTime); saOrderExt.setCreationTime(currentDateTime); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { saOrderItems.setCreationTime(saOrderExt.getCreationTime()); saOrderItems.setOrderStatus(EOrderStatus.PAY.getValue()); @@ -1065,8 +1059,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl * @param saOrderExt 订单信息 * @param cuMemberAccountExt 会员账户 * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 10:24 */ @Override @Transactional(rollbackFor = Exception.class) @@ -1077,17 +1069,22 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (setLastCuMemberGrade(cuMember, saOrderExt)) { return false; } - // 验证等级，原等级<新等级 - if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue()) { - if (saOrderExt.getOrderType().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { - // TODO new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 - if (!((EGrade.MAKER.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) - || (EGrade.VIP.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0)) - ) { - return false; - } - } + // 验证等级，原等级<新等级，才可以进行升级 或者事累计升级 + String upgradeWay = querySystemConfigByKey(saOrderExt.getPkCountry(), ESystemConfig.UPGRADE_WAY.getKey()); + if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue() && !Objects.equals(Integer.toString(EUpgradeWay.TOTAL.getValue()), upgradeWay)) { + return false; } +// // 验证等级，原等级<新等级 +// if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue()) { +// if (saOrderExt.getOrderType().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { +// // TODO new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 +// if (!((EGrade.MAKER.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) +// || (EGrade.VIP.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0)) +// ) { +// return false; +// } +// } +// } // 封装保存订单数据 encapsulationSaOrder(saOrderExt); @@ -1244,6 +1241,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (StringUtils.isEmpty(orderCode)) { orderCode = saOrderHandle.createOrderCode(EOrderPrefix.ORDER_CODE.getValue()); } + // 封装订单信息 SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, cuMember, orderCode); // 封装订单明细（2024.02.02添加处理订单扩展类型） saOrderHandle.packSaOrderItems(cuMember, saOrderExt, orderParam); @@ -1329,16 +1327,16 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (grade.getGradeValue() < gradeDTO.getGradeValue()) { orderReturn.setIsEnough(Boolean.TRUE); } else { - if (orderParam.getSpecialArea().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { - // TODO new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 - if (EGrade.MAKER.getValue() == grade.getGradeValue() - && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) { - orderReturn.setIsEnough(Boolean.TRUE); - } else if (EGrade.VIP.getValue() == grade.getGradeValue() - && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0) { - orderReturn.setIsEnough(Boolean.TRUE); - } - } +// if (orderParam.getSpecialArea().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { +// // TODO new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 +// if (EGrade.MAKER.getValue() == grade.getGradeValue() +// && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) { +// orderReturn.setIsEnough(Boolean.TRUE); +// } else if (EGrade.VIP.getValue() == grade.getGradeValue() +// && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0) { +// orderReturn.setIsEnough(Boolean.TRUE); +// } +// } gradeDTO.setGradeName(null); } } @@ -1355,6 +1353,35 @@ public class SaOrderServiceImpl extends ServiceImpl impl BigDecimal orderAchieve = saOrder.getOrderAchieve(); // 判断专区 升级方式不一样 String upgradeWay = querySystemConfigByKey(pkCountry, ESystemConfig.UPGRADE_WAY.getKey()); + + if (specialArea.equals(EOrderType.UPGRADE_ORDER.getValue()) +// || (cuMember != null && Objects.equals(cuMember.getPkSettleGrade(), MagicNumberConstants.CHINA_HA_FUN)) + ) { +// if (Objects.equals(cuMember.getPkSettleGrade(), MagicNumberConstants.CHINA_HA_FUN)) { +// upgradeWay = Integer.toString(EUpgradeWay.DIFFERENCE.getValue()); +// } + if (EUpgradeWay.COVER.getValue() != Integer.parseInt(upgradeWay)) { + // 获得历史订单pv + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select(" pk_member,sum(order_amount) order_amount,sum(order_achieve) order_achieve "); + queryWrapper.eq(SaOrderFieldConstants.ORDER_STATUS, EOrderStatus.PAY.getValue()) + .eq(MemberFieldConstants.PK_MEMBER, pkMember) + .groupBy("pk_member"); + if (StringUtils.isNotEmpty(saOrder.getOrderCode())) { + queryWrapper.ne(SaOrderFieldConstants.ORDER_CODE, saOrder.getOrderCode()); + } + SaOrder hisSaOrder = baseMapper.selectOne(queryWrapper); + if (hisSaOrder != null) { + orderAmount = orderAmount.add(hisSaOrder.getOrderAmount()); + orderAchieve = orderAchieve.add(hisSaOrder.getOrderAchieve()); + } + // 累计升级无论是否升级都满足条件 + if (EUpgradeWay.TOTAL.getValue() == Integer.parseInt(upgradeWay)) { + orderReturn.setIsEnough(Boolean.TRUE); + } + } + } + return saOrderHandle.getMemberGradeAndAwardByCountry(orderAmount, orderAchieve, pkCountry, upgradeWay); } diff --git a/hzs-third/src/main/java/com/hzs/third/job/controller/JobTestController.java b/hzs-third/src/main/java/com/hzs/third/job/controller/JobTestController.java index cdf27b5b..e52e159a 100644 --- a/hzs-third/src/main/java/com/hzs/third/job/controller/JobTestController.java +++ b/hzs-third/src/main/java/com/hzs/third/job/controller/JobTestController.java @@ -41,9 +41,14 @@ public class JobTestController { @GetMapping("/test") public AjaxResult test() { + Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); memberBonusSettleApi.autoCalculateBonus(startDate); + +// log.info("开始进行奖金公布"); +// memberBonusSettleApi.autoPublishBonus(); + return AjaxResult.success(); }