diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java index ba485102..05dd8868 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 发货单明细表 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaDeliverItemsMapper extends BaseMapper { @@ -26,7 +23,6 @@ public interface SaDeliverItemsMapper extends BaseMapper { */ List queryDeliverHandledList(@Param("param") DeliverHandledParam param, @Param("pkCountry") Integer pkCountry); - /** * 批量插入 * @@ -64,10 +60,7 @@ public interface SaDeliverItemsMapper extends BaseMapper { @Param("pkCountry") Integer pkCountry); /* - * @description: 查询订单是否绑定追溯码 - * @author: sui q - * @date: 2023/7/21 17:02 - * @param: null null + * 查询订单是否绑定追溯码 **/ List querySaDeliverItemByOrder(@Param("orderCode") String orderCode, @Param("itemIdList") List itemIdList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java index 371f8858..e3b826ef 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 发货单明细表 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaDeliverItemsService extends IService { @@ -48,20 +45,14 @@ public interface ISaDeliverItemsService extends IService { List orderStatusList, Integer pkCountry); - /* - * @description: 查询订单是否绑定追溯码 - * @author: sui q - * @date: 2023/7/21 17:02 - * @param: null null - **/ + /** + * 查询订单是否绑定追溯码 + */ Boolean validateOrderBindBarCode(String orderCode, List itemIdList); - /* - * @description: 删除发货单 - * @author: sui q - * @date: 2023/9/14 15:47 - * @param: null null - **/ + /** + * 删除发货单 + */ void deleteSaDeliverItems(Long pkOrder, List pkOrderItemsList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java index f7da7abc..9e2c004c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java @@ -15,9 +15,6 @@ import java.util.List; /** * 发货单明细表 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Service public class SaDeliverItemsServiceImpl extends ServiceImpl implements ISaDeliverItemsService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java index 213ab8a1..50cac495 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java @@ -2,7 +2,7 @@ package com.hzs.sale.order.controller.api; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.domain.R; @@ -142,8 +142,6 @@ public class ApiOrderController extends BaseController { List myOrderItemsList = null; // 是否处理 boolean isHandle = false; - // 汇率（目前只有中国需要由美金转人民币显示，其它国家显示就是美金不需要转换） - BigDecimal baseExchangeRate = saOrder.getInExchangeRate(); // 遍历订单明细，转换成前台显示内容 for (SaOrderItemsExt saOrderItems : orderItemsList) { @@ -183,18 +181,8 @@ public class ApiOrderController extends BaseController { myOrder.setOrderStatus(saOrderItems.getOrderStatus()); // 订单显示金额 = 订单金额 + 运费 myOrder.setOrderAmount(myOrder.getOrderAmount().add(myOrder.getPostage())); - - if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - // 登录会员如果是中国会员，订单显示人民币业绩 - myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(currencyDTO.getInExchangeRate())); - } - if (!saOrder.getPkCountry().equals(pkCountry)) { - // 订单结算国与登录结算国不相同，需要处理金额转换（订单金额 除 订单结算国汇率 乘 登录结算国汇率） - if (baseExchangeRate.compareTo(currencyDTO.getInExchangeRate()) != 0) { - // 订单结算国与登录结算国汇率不相同才进行处理 - myOrder.setOrderAmount(myOrder.getOrderAmount().multiply(currencyDTO.getInExchangeRate()).divide(baseExchangeRate, 6, BigDecimal.ROUND_HALF_UP).setScale(6, BigDecimal.ROUND_HALF_UP)); - } - } + // 登录会员如果是中国会员，订单显示人民币业绩 + myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(currencyDTO.getInExchangeRate())); String recProvince = areaMap.get(saOrder.getRecProvince()); if (StringUtils.isNotEmpty(recProvince)) { @@ -292,13 +280,12 @@ public class ApiOrderController extends BaseController { // 当前用户 Long userId = SecurityUtils.getUserId(); - QueryWrapper orderQueryWrapper = new QueryWrapper<>(); - orderQueryWrapper.eq("ORDER_CODE", orderCode).and(wrapper -> wrapper.eq("PK_MEMBER", userId).or().eq(SystemFieldConstants.PK_CREATOR, userId)); + LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); + orderQueryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId)); SaOrder saOrder = iSaOrderService.getOne(orderQueryWrapper); if (null != saOrder) { // 查询订单 List deliverList = iSaOrderItemsService.queryDeliverByOrder(saOrder.getPkId()); -// List saDeliverList = iSaDeliverService.queryDeliverByOrder(saOrder.getPkId()); if (CollectionUtil.isNotEmpty(deliverList)) { for (SaOrderItems orderItems : deliverList) { if (null != orderItems && StringUtils.isNotEmpty(orderItems.getLogisticsCode())) { @@ -343,9 +330,8 @@ public class ApiOrderController extends BaseController { public AjaxResult confirm(@PathVariable("orderCode") String orderCode) { Long userId = SecurityUtils.getUserId(); - QueryWrapper orderQueryWrapper = new QueryWrapper<>(); - orderQueryWrapper.eq("ORDER_CODE", orderCode).and(wrapper -> wrapper.eq("PK_MEMBER", userId).or().eq(SystemFieldConstants.PK_CREATOR, userId)); - // orderQueryWrapper.eq("PK_MEMBER", userId); + LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); + orderQueryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId)); SaOrder saOrder = iSaOrderService.getOne(orderQueryWrapper); if (null != saOrder) { if (EOrderStatus.DELIVERED.getValue() != saOrder.getOrderStatus()) { @@ -367,8 +353,8 @@ public class ApiOrderController extends BaseController { public AjaxResult cancel(@PathVariable("orderCode") String orderCode) { Long userId = SecurityUtils.getUserId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ORDER_CODE", orderCode).and(wrapper -> wrapper.eq("PK_MEMBER", userId).or().eq(SystemFieldConstants.PK_CREATOR, userId)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId)); SaOrder saOrder = iSaOrderService.getOne(queryWrapper); if (null != saOrder) { if (EOrderStatus.WAIT_PAY.getValue() != saOrder.getOrderStatus()) { @@ -484,11 +470,6 @@ public class ApiOrderController extends BaseController { /** * 自助业务-订单自提订单列表 - * - * @author: zhang jing - * @date: 2023/5/29 9:10 - * @param: [selfPickUpParam] - * @return: com.hzs.common.core.web.page.TableDataInfo **/ @GetMapping("/self-list") public TableDataInfo selfOrderList(MyOrderParam param) { @@ -522,8 +503,6 @@ public class ApiOrderController extends BaseController { saOrder.setMemberCode(CommonUtil.getMemberCode(saOrder.getMemberCode(), saOrder.getMemberServiceCode())); saOrder.setMemberName(CommonUtil.getMemberName(saOrder.getMemberPkVertex(), saOrder.getMemberName(), saOrder.getMemberNickName())); } - // 汇率（目前只有中国需要由美金转人民币显示，其它国家显示就是美金不需要转换） -// BigDecimal baseExchangeRate = saOrder.getInExchangeRate(); //处理订单收货地址 String recProvince = areaMap.get(saOrder.getRecProvince()); @@ -612,16 +591,13 @@ public class ApiOrderController extends BaseController { myOrder.setAddress(saOrder.getRecAddress()); // 直销订单处理 - if (saOrder.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - // 中国需要处理PV显示问题 - // 汇率（目前只有中国需要由美金转人民币显示，其它国家显示就是美金不需要转换） - BigDecimal baseExchangeRate = saOrder.getInExchangeRate(); - if (null != baseExchangeRate) { - // 基础汇率不为空，则进行转换 - myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(baseExchangeRate)); - for (MyOrderItemsVO myOrderItemsVO : myOrder.getItemList()) { - myOrderItemsVO.setAchievement(myOrderItemsVO.getAchievement().multiply(baseExchangeRate)); - } + // 汇率（目前只有中国需要由美金转人民币显示，其它国家显示就是美金不需要转换） + BigDecimal baseExchangeRate = saOrder.getInExchangeRate(); + if (null != baseExchangeRate) { + // 基础汇率不为空，则进行转换 + myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(baseExchangeRate)); + for (MyOrderItemsVO myOrderItemsVO : myOrder.getItemList()) { + myOrderItemsVO.setAchievement(myOrderItemsVO.getAchievement().multiply(baseExchangeRate)); } } @@ -644,11 +620,6 @@ public class ApiOrderController extends BaseController { /** * 自助撤单列表(24点内) - * - * @author: zhang jing - * @date: 2023/11/21 10:33 - * @param: [param] - * @return: com.hzs.common.core.web.page.TableDataInfo **/ @GetMapping("/selfRevokeList") public TableDataInfo selfRevokeList(MyOrderParam param) { @@ -671,9 +642,6 @@ public class ApiOrderController extends BaseController { // 获取订单ID列表 List orderIdList = new ArrayList<>(); - // 当前国家汇率 - CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(pkCountry).getData(); - for (SaOrderExt saOrderExt : orderList) { // 默认为直销订单 orderIdList.add(saOrderExt.getPkId()); @@ -727,15 +695,8 @@ public class ApiOrderController extends BaseController { myOrder.setOrderStatus(saOrderItems.getOrderStatus()); // 订单显示金额 = 订单金额 + 运费 myOrder.setOrderAmount(myOrder.getOrderAmount().add(myOrder.getPostage())); - - if (saOrder.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - // 如果是中国订单 - myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(baseExchangeRate)); - } - if (!saOrder.getPkCountry().equals(pkCountry)) { - // 订单结算国与登录结算国不相同，需要处理金额转换（订单金额 除 订单结算国汇率 乘 登录结算国汇率） - myOrder.setOrderAmount(myOrder.getOrderAmount().multiply(currencyDTO.getInExchangeRate()).divide(baseExchangeRate, 2, BigDecimal.ROUND_HALF_UP)); - } + // 如果是中国订单 + myOrder.setOrderAchieve(myOrder.getOrderAchieve().multiply(baseExchangeRate)); String recProvince = areaMap.get(saOrder.getRecProvince()); if (StringUtils.isNotEmpty(recProvince)) { @@ -781,15 +742,9 @@ public class ApiOrderController extends BaseController { /** * 自动撤单参数校验 - * - * @author: zhang jing - * @date: 2023/11/21 14:49 - * @param: [orderQueryParam] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @PostMapping("/check-self-revoke-order") public AjaxResult checkSelfRevokeOrder(@RequestBody MyOrderVO myOrderVO) { - log.info(myOrderVO.getOrderCode()); // 验证订单编号、订单类型是否存在 if (StringUtils.isEmpty(myOrderVO.getOrderCode())) { return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CODE_EMPTY)); @@ -808,11 +763,6 @@ public class ApiOrderController extends BaseController { /** * 自助撤单 - * - * @author: zhang jing - * @date: 2023/11/21 15:19 - * @param: [orderCancelParam] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @PostMapping("/self-revoke-order") public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiSaOrderBusinessController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiSaOrderBusinessController.java index b81b43b1..3a8d4cf3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiSaOrderBusinessController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiSaOrderBusinessController.java @@ -1,7 +1,7 @@ package com.hzs.sale.order.controller.api; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.enums.*; @@ -24,30 +24,20 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Description: 订单自助业务 - * @Author: sui q - * @Time: 2022/10/25 11:38 - * @Classname: ApiFanSaOrderController - * @PackageName: com.hzs.sale.order.controller.api + * 订单自助业务 */ @RestController @RequestMapping("/api/order") @Slf4j public class ApiSaOrderBusinessController extends ParentOrderController { - private ISaOrderSelfLogService saOrderSelfLogService; - @Autowired - public void setSaOrderSelfLogService(ISaOrderSelfLogService saOrderSelfLogService) { - this.saOrderSelfLogService = saOrderSelfLogService; - } + private ISaOrderSelfLogService iSaOrderSelfLogService; /** + * 订单申请自提 + * * @param selfPickUpParam 订单参数 - * @Description: 订单申请自提 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/self-pick-up") public AjaxResult selfPickUpSaOrder(@RequestBody SelfPickUpParam selfPickUpParam) throws Exception { @@ -61,9 +51,9 @@ public class ApiSaOrderBusinessController extends ParentOrderController { selfPickUpParam.setCenterCodeId(SecurityUtils.getUserId()); selfPickUpParam.setPkSettleCountry(SecurityUtils.getPkCountry()); SaOrder saOrder = getOrderService().querySaleOrderByOrderCode(SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(selfPickUpParam.getOrderCode()).build()); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_ORDER", saOrder.getPkId()); - List list = saOrderSelfLogService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SaOrderSelfLog::getPkOrder, saOrder.getPkId()); + List list = iSaOrderSelfLogService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.SELF_PICKUP_ORDER_REPEAT)); } @@ -72,7 +62,7 @@ public class ApiSaOrderBusinessController extends ParentOrderController { return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CURRENT_DATE)); } selfPickUpParam.setPkCreator(SecurityUtils.getUserId()); - saOrderSelfLogService.applySelfPickUpSaOrder(saOrder, selfPickUpParam); + iSaOrderSelfLogService.applySelfPickUpSaOrder(saOrder, selfPickUpParam); return AjaxResult.success(selfPickUpParam); } @@ -88,7 +78,8 @@ public class ApiSaOrderBusinessController extends ParentOrderController { if (selfPickUpParam.getApproveStatus() == null) { selfPickUpParam.setApproveStatus(EApproveRechargeStatus.SUBMIT.getValue()); } - List orderSelfLogList = saOrderSelfLogService.queryMemberSaOrderSelfLog(selfPickUpParam); + List orderSelfLogList = iSaOrderSelfLogService.queryMemberSaOrderSelfLog(selfPickUpParam); return getDataTable(orderSelfLogList); } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderSelfLogMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderSelfLogMapper.java index 50e8c530..24ff7bd8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderSelfLogMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderSelfLogMapper.java @@ -8,28 +8,17 @@ import com.hzs.sale.order.param.SelfPickUpParam; import java.util.List; /** - *

* 订单自提申请记录 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-19 */ public interface SaOrderSelfLogMapper extends BaseMapper { - /* - * @description: 查询自提订单 - * @author: sui q - * @date: 2023/4/19 19:24 - * @param: null null - **/ + /** + * 查询自提订单 + */ List querySaOrderSelfLog(SelfPickUpParam selfPickUpVO); - /* - * @description: 查询自提订单 - * @author: sui q - * @date: 2023/4/19 19:24 - * @param: null null - **/ + /** + * 查询自提订单 + */ List queryMemberSaOrderSelfLog(SelfPickUpParam selfPickUpVO); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderSelfLogService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderSelfLogService.java index e76cf121..82a3b571 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderSelfLogService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderSelfLogService.java @@ -9,53 +9,33 @@ import com.hzs.sale.order.param.SelfPickUpParam; import java.util.List; /** - *

* 订单自提申请记录 服务类 - *

- * - * @author hzs - * @since 2023-04-19 */ public interface ISaOrderSelfLogService extends IService { - /* - * @description: 会员端自提，记录日志,申请记录 - * @author: sui q - * @date: 2023/4/19 17:37 - * @param: null null - **/ + /** + * 会员端自提，记录日志,申请记录 + */ void applySelfPickUpSaOrder(SaOrder saOrder, SelfPickUpParam selfPickUpVO); - /* - * @description: 查询自提订单 - * @author: sui q - * @date: 2023/4/19 19:24 - * @param: null null - **/ + /** + * 查询自提订单 + */ List querySaOrderSelfLog(SelfPickUpParam selfPickUpVO); - /* - * @description: 查询自提订单 - * @author: sui q - * @date: 2023/4/20 15:30 - * @param: null null - **/ + /** + * 查询自提订单 + */ SaOrderSelfLog querySaOrderSelfLogById(Long pkId); - /* - * @description: 查询自提订单 - * @author: sui q - * @date: 2023/4/19 19:24 - * @param: null null - **/ + /** + * 查询自提订单 + */ List queryMemberSaOrderSelfLog(SelfPickUpParam selfPickUpVO); - /* - * @description: 更新自提订单状态 - * @author: sui q - * @date: 2023/4/20 15:38 - * @param: null null - **/ + /** + * 更新自提订单状态 + */ void updateSaOrderSelfLog(SelfPickUpParam selfPickUpVO, Long pkId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 89af7e35..cd20c7c9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -434,7 +434,6 @@ public interface ISaOrderService extends IService { **/ List selfAddressOrderList(MyOrderParam param, Long memberId, Integer pkCountry); - /** * 我的订单数量 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index 2f325608..b43e6025 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -2399,8 +2399,8 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { return myOrderVO; } //注册订单撤单验证 - if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() || - myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) { + if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() + || myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) { //校验会员是否存在推荐或安置 if (iMemberServiceApi.checkLowerMember(myOrderVO.getPkMember()).getData()) { myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LOWER_EXIST)); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderSelfLogServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderSelfLogServiceImpl.java index 6df69b6c..f5a9e273 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderSelfLogServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderSelfLogServiceImpl.java @@ -1,9 +1,7 @@ package com.hzs.sale.order.service.impl; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EApproveRechargeStatus; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.DateUtils; @@ -19,12 +17,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 订单自提申请记录 服务实现类 - *

- * - * @author hzs - * @since 2023-04-19 */ @Service public class SaOrderSelfLogServiceImpl extends ServiceImpl implements ISaOrderSelfLogService { @@ -64,14 +57,14 @@ public class SaOrderSelfLogServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDate()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, selfPickUpVO.getPkCreator()); - updateWrapper.set(SystemFieldConstants.APPROVE_STATUS, selfPickUpVO.getApproveStatus()); - if(StringUtils.isNotEmpty(selfPickUpVO.getRejectMsg())){ - updateWrapper.set("REJECT_MSG", selfPickUpVO.getRejectMsg()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(SaOrderSelfLog::getModifiedTime, DateUtils.currentDate()); + updateWrapper.set(SaOrderSelfLog::getPkModified, selfPickUpVO.getPkCreator()); + updateWrapper.set(SaOrderSelfLog::getApproveStatus, selfPickUpVO.getApproveStatus()); + if (StringUtils.isNotEmpty(selfPickUpVO.getRejectMsg())) { + updateWrapper.set(SaOrderSelfLog::getRejectMsg, selfPickUpVO.getRejectMsg()); } - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); + updateWrapper.eq(SaOrderSelfLog::getPkId, pkId); update(updateWrapper); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index e1b7f5dc..0a4be8d1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -105,9 +105,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl @DubboReference IMemberServiceApi memberServiceApi; @DubboReference - IGradeServiceApi gradeServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference IAreaServiceApi areaServiceApi; @DubboReference @@ -702,8 +702,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setPkSettleGradeValue(gradeDTO.getGradeValue()); // 判断奖衔，原会员有奖衔的话判断哪个大，使用大的 if (pkAwards != null && gradeDTO.getGradeValue() != null) { - BdAwards bdAwards = awardsServiceApi.getAwardsOne(pkAwards).getData(); - BdAwards newAwards = awardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData(); + BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(pkAwards).getData(); + BdAwards newAwards = iAwardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData(); if (bdAwards.getAwardsValue() < newAwards.getAwardsValue()) { cuMember.setPkAwards(gradeDTO.getPkAwards()); } @@ -976,7 +976,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Boolean payUpgradeSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt) { CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember()); - GradeDTO oldGradeDTO = gradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); + GradeDTO oldGradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); // 封装等级,重新计算会员等级 if (setLastCuMemberGrade(cuMember, saOrderExt)) { return false; @@ -1209,7 +1209,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (orderParam.getIsEnough() != null && orderParam.getIsEnough()) { orderReturn.setIsEnough(Boolean.TRUE); CuMember member = getCuMemberByKey(orderParam.getCenterCodeId()); - GradeDTO grade = gradeServiceApi.getGrade(member.getPkSettleGrade()).getData(); + GradeDTO grade = iGradeServiceApi.getGrade(member.getPkSettleGrade()).getData(); orderReturn.setPkGradeVal(grade.getGradeName()); return orderReturn; } @@ -1222,7 +1222,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl } else { member = getCuMemberByKey(orderParam.getCenterCodeId()); } - GradeDTO grade = gradeServiceApi.getGrade(member.getPkSettleGrade()).getData(); + GradeDTO grade = iGradeServiceApi.getGrade(member.getPkSettleGrade()).getData(); if (grade.getGradeValue() < gradeDTO.getGradeValue()) { orderReturn.setIsEnough(Boolean.TRUE); } else { @@ -1802,10 +1802,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl /** * @param pkParent 推荐人 * @param pkCountry 国家 - * 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 + * @Description: 验证第二部门是否需要验证首单 */ @Override public boolean validateFirstOrder(Long pkParent, Integer pkCountry) { @@ -1820,10 +1817,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl /** * @param pkPlaceParent 安置位置 * @param pkCountry 国家 - * 验证第二部门是否需要验证首单 - * @return: boolean - * @Author: sui q - * @Date: 2022/9/7 9:29 + * @Description: 验证第二部门是否需要验证首单 */ @Override public boolean validateLeftExistMember(Long pkPlaceParent, Integer pkCountry) { @@ -1908,10 +1902,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl /** * @description: 自助撤单列表 - * @author: zhang jing - * @date: 2023/11/21 11:24 - * @param: [param, memberId, pkCountry] - * @return: java.util.List **/ @Override public List selfRevokeOrderList(MyOrderParam param, Long memberId, Integer pkCountry) { @@ -1919,38 +1909,16 @@ public class SaOrderServiceImpl extends ServiceImpl impl } - /** - * @description: 自助服务-可申请订单列表 - * @author: zhang jing - * @date: 2023/4/19 11:29 - * @param: [param, memberId, pkCountry] - * @return: java.util.List - **/ @Override public List selfOrderList(MyOrderParam param, Long memberId, Integer pkCountry) { return baseMapper.selfOrderList(param, memberId, pkCountry); } - /** - * @description: 查询最新待发货订单 - * @author: zhang jing - * @date: 2023/11/22 16:28 - * @param: [memberId, pkCountry] - * @return: java.util.List - **/ @Override public String lastOrderList(Long memberId, Integer pkCountry) { return baseMapper.lastOrderList(memberId, pkCountry); } - - /** - * @description: 自助服务- 修改收货地址订单列表 - * @author: zhang jing - * @date: 2023/5/11 14:17 - * @param: [param, memberId, pkCountry] - * @return: java.util.List - **/ @Override public List selfAddressOrderList(MyOrderParam param, Long memberId, Integer pkCountry) { return baseMapper.selfAddressOrderList(param, memberId, pkCountry); @@ -2187,9 +2155,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl * 支付分享订单 * * @param saOrderExt 订单 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/15 17:27 */ @Override @Transactional(rollbackFor = Exception.class) @@ -2358,13 +2323,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - /** - * @description: 查询当天已支付订单信息 - * @author: zhang jing - * @date: 2023/5/17 14:37 - * @param: [orderType] - * @return: java.util.List - **/ @Override public List querySaOrderByOrderType(String payTime) { return baseMapper.querySaOrderByOrderType(payTime); @@ -2447,20 +2405,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl return i; } - /** - * 根据编号查询会员首单 - * - * @param memberCodeList - * @return - */ @Override public List checkMemberIsFirstOrder(List memberCodeList) { return baseMapper.checkMemberIsFirstOrder(memberCodeList); } - /** - * @description: 自助撤单 - **/ @Override @Transactional(rollbackFor = Exception.class) public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) { @@ -2479,7 +2428,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new RuntimeException("更新订单失败"); } - //添加订单日志表 + // 添加订单日志表 // 本批订单修改记录编号 String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.DEFAULT); SaOrderChargeLog saOrderChargeLog = this.packageSaOrderChargeLog(currentDate, pkApprove, @@ -2493,8 +2442,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderChargeLogService.save(saOrderChargeLog); // 撤销注册订单(注册订单,海粉订单,特殊注册订单) - if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() || - myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) { + if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() + || myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) { // 逻辑删除会员 if (!memberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) { throw new RuntimeException("撤单失败"); @@ -2525,8 +2474,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 记录原奖衔与新奖衔 BdAwards tmpAwards; // 判断奖衔，原奖衔>新奖衔 不进行变奖衔 - BdAwards oldAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); - BdAwards newAwards = awardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData(); + BdAwards oldAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); + BdAwards newAwards = iAwardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData(); if (oldAwards.getAwardsValue() > newAwards.getAwardsValue()) { cuMember.setPkAwards(gradeDTO.getPkAwards()); tmpAwards = newAwards; @@ -2640,9 +2589,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - /** - * @description: - **/ private SaOrderChargeLog packageSaOrderChargeLog(Date nowDate, Long userId, Integer chargeType, String businessCode, MyOrderVO saOrder, Integer approvalStatus) { SaOrderChargeLog saOrderChargeLog = new SaOrderChargeLog(); @@ -2663,11 +2609,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryByPkIdOrCode(pkOrder, orderCode, pkCountry); } - /** - * 查询订单单品统计 - * - * @return - */ @Override public List singleItemStat(SingleItemStatParam singleItemStatParam) { return baseMapper.singleItemStat(singleItemStatParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java index 50e8f5a6..6af5a047 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java @@ -254,8 +254,9 @@ public class ApiSaTicketController extends ParentOrderController { /** + * 验证字段是否必输 + * * @param fieldList 需要验证的字段 - * 验证字段是否必输 */ private boolean validateFieldNotNull(BuyTicketParam buyTicketParam, List fieldList) { return fieldList.stream().anyMatch(field -> { diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml index b44563d1..460157f3 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml @@ -8,7 +8,7 @@ from ac_ticket at where at.del_flag = 0 and to_char(#{queryDate}, 'yyyy-mm-dd') >= to_char(at.dis_start_date, 'yyyy-mm-dd') - and to_char(at.dis_end_date, 'yyyy-mm-dd') >= to_char((#{queryDate}, 'yyyy-mm-dd') + and to_char(at.dis_end_date, 'yyyy-mm-dd') >= to_char(#{queryDate}, 'yyyy-mm-dd') and (at.pk_vertex is null or at.pk_vertex = '' or at.pk_vertex like ',' || #{pkVertex} || ',') and at.pk_country = #{pkCountry} diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml index 0766e891..a6a6d819 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml @@ -543,10 +543,10 @@ + select sl.pk_id,sl.self_code,sl.phone,sl.remark,sl.approve_status,sl.REJECT_MSG,cmb.member_name applyName, - sl.creation_time,cm.member_code,cmr.member_name creator, - cm.member_name, - so.order_code, - so.order_type, - bp.cover, - bp.product_name, - soi.pk_id order_items_id, - soi.is_gift, - soi.QUANTITY, - soi.specs_name, - bc.name classify_type, - soi.pk_product PRODUCT_ID + sl.creation_time,cm.member_code,cmr.member_name creator, + cm.member_name, + so.order_code, + so.order_type, + bp.cover, + bp.product_name, + soi.pk_id order_items_id, + soi.is_gift, + soi.QUANTITY, + soi.specs_name, + bc.name classify_type, + soi.pk_product PRODUCT_ID from sa_order_self_log sl - inner join sa_order so - on sl.pk_order = so.pk_id - inner join cu_member cm - on cm.pk_id = so.pk_member + inner join sa_order so + on sl.pk_order = so.pk_id + inner join cu_member cm + on cm.pk_id = so.pk_member left join cu_member cmb - on sl.pk_creator = cmb.pk_id - left join sa_order_items soi - on soi.pk_order = so.pk_id - and soi.del_flag = 0 - inner join BD_PRODUCT bp - on bp.pk_id = soi.pk_product - inner join bd_classify bc - on bp.pk_classify = bc.pk_id - left join cu_member cmr - on sl.pk_creator = cmr.pk_id + on sl.pk_creator = cmb.pk_id + left join sa_order_items soi + on soi.pk_order = so.pk_id + and soi.del_flag = 0 + inner join BD_PRODUCT bp + on bp.pk_id = soi.pk_product + inner join bd_classify bc + on bp.pk_classify = bc.pk_id + left join cu_member cmr + on sl.pk_creator = cmr.pk_id where so.del_flag = 0 and sl.del_flag=0 and cm.del_flag=0 and soi.del_flag=0 - and so.pk_country = #{pkSettleCountry} + and so.pk_country = #{pkSettleCountry} and cm.member_code=#{memberCode} @@ -99,6 +99,7 @@ order by so.order_code desc +