angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 自助撤单处理推荐人等级；去掉条码校验；

This commit is contained in:
cabbage 2025-07-12 16:24:23 +08:00
parent 9b225459a0
commit 4e813f17b9
16 changed files with 18 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java
View File

@ -96,13 +96,6 @@ public interface IMemberServiceApi {
*/
R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, String memberCode, String phone);
/**
* 查找安置人伞上会员信息
*
* @param memberId 编号、安置人
*/
R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList);
/**
* 查找安置人伞下
*
@ -268,15 +261,6 @@ public interface IMemberServiceApi {
*/
R<Boolean> updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel);
/**
* 校验是否血缘关系（返回true则有血缘关系）
*
* @param topCode 顶点编号
* @param userId 当前会员
* @return
*/
R<Boolean> checkParent(String topCode, Long userId);
/**
* 获取奖衔的翻译KEY值
**/

16
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java
View File

@ -50,13 +50,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
@Param("memberCode") String memberCode,
@Param("phone") String phone);
/**
* 查找安置人伞上会员信息
*
* @param memberId 编号、安置人
*/
List<CuMemberExt> querySponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCodeList") List<String> memberCodeList);
/**
* 查找安置人伞下
*
@ -277,15 +270,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*/
List<ParentMemberVo> parentList(@Param("pkParent") Long pkParent, @Param("memberCode") String memberCode, @Param("memberName") String memberName, @Param("startCreateTime") Date startCreateTime, @Param("endCreateTime") Date endCreateTime, @Param("memberInfo") String memberInfo);
/**
* 校验是否血缘关系
*
* @param topCode 顶点编号
* @param pkMember 当前会员
* @return
*/
int checkParent(@Param("topCode") String topCode, @Param("pkMember") Long pkMember);
/**
* 校验会员编号是否存在
*

10
bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java
View File

@ -130,11 +130,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberService.queryPlaceSponsorOnUmbrella(memberId, memberCode, phone));
}
@Override
public R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList) {
return R.ok(iCuMemberService.querySponsorOnUmbrella(memberId, memberCodeList));
}
@Override
public R<List<CuMemberExt>> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList) {
return R.ok(iCuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList));
@ -273,11 +268,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberBusinessService.updateMemberLevel(cuMember, saOrder, pkOldLevel));
}
@Override
public R<Boolean> checkParent(String topCode, Long userId) {
return R.ok(iCuMemberService.checkParent(topCode, userId) > 0);
}
@Override
public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) {
return iCuMemberService.getAwardsTranslateValue(pkCountry, pkId);

16
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -108,13 +108,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/
List<CuMemberExt> queryPlaceSponsorOnUmbrella(Long memberId, String memberCode, String phone);
/**
* 查找安置人伞上会员信息
*
* @param memberId 编号、安置人
*/
List<CuMemberExt> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList);
/**
* 查找安置人伞下
*
@ -483,15 +476,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/
List<ParentMemberVo> parentList(Long pkParent, String memberCode, String memberName, Date startCreateTime, Date endCreateTime, String memberInfo);
/**
* 校验是否血缘关系
*
* @param topCode 顶点编号
* @param pkMember 当前会员
* @return
*/
int checkParent(String topCode, Long pkMember);
/**
* 校验会员编号是否存在
*

8
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -648,14 +648,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return true;
}
/**
* @description: 自助服务-生成订单
* @author: zhang jing
* @date: 2023/4/18 17:13
* @param: [pkApprove, saOrder, payMemberAccount]
* @return: void
**/
@Transactional(rollbackFor = Exception.class)
@Override
public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) {

10
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -202,11 +202,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.selectPlaceSponsorOnUmbrella(memberId, memberCode, phone);
}
@Override
public List<CuMemberExt> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList) {
return baseMapper.querySponsorOnUmbrella(memberId, memberCodeList);
}
@Override
public List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList) {
return baseMapper.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList);
@ -2390,11 +2385,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.selectRegList(marketNewsParam);
}
@Override
public int checkParent(String topCode, Long pkMember) {
return baseMapper.checkParent(topCode, pkMember);
}
@Override
public Map<String, Integer> checkMemberCodeExist(Collection<String> codeList, Boolean checkEmpty, Long excludeMemberEmpty) {
Map<String, Integer> resultMap = new HashMap<>();

20
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -1528,15 +1528,6 @@
</select>
<!-- 校验是否血缘关系 -->
<select id="checkParent" resultType="int">
select count(1)
from cu_member cm
where cm.member_code = #{topCode} start
with cm.pk_id = #{pkMember}
connect by cm.pk_id = prior cm.pk_parent
</select>
<!-- 校验会员编号是否存在 -->
<select id="checkMemberCodeExist" resultType="com.hzs.member.base.dto.MemberCountDTO">
select tmp.member_code, count(tmp.member_code) member_count
@ -2060,17 +2051,6 @@
and cm.member_name = #{memberName}
and cm.phone = #{phone}
</select>
<select id="querySponsorOnUmbrella" resultType="com.hzs.common.domain.member.ext.CuMemberExt">
select * from(
<foreach collection="memberCodeList" item="item" index="index" separator="union">
select t.pk_id, t.member_code, t.member_name, t.phone, t.pk_place_parent,level num
from cu_member t
where t.del_flag = 0 and member_code = #{item}
start with t.pk_id = #{memberId}
connect by t.pk_id = prior t.pk_place_parent
</foreach>)
order by num desc
</select>
<!-- 查询新零售会员信息-->
<select id="retailMemberList" resultType="com.hzs.member.base.vo.RetailMemberVO">

12
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java
View File

@ -11,9 +11,6 @@ import java.util.List;
/**
* 发货单明细表 Mapper 接口
*
* @author hzs
* @since 2022-08-31
*/
public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
@ -26,7 +23,6 @@ public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
*/
List<DeliverHandledVO> queryDeliverHandledList(@Param("param") DeliverHandledParam param, @Param("pkCountry") Integer pkCountry);
/**
* 批量插入
*
@ -63,12 +59,4 @@ public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
@Param("orderStatusList") List<Integer> orderStatusList,
@Param("pkCountry") Integer pkCountry);
/*
* @description: 查询订单是否绑定追溯码
* @author: sui q
* @date: 2023/7/21 17:02
* @param: null null
**/
List<SaDeliverItems> querySaDeliverItemByOrder(@Param("orderCode") String orderCode, @Param("itemIdList") List<Long> itemIdList);
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java
View File

@ -8,9 +8,6 @@ import java.util.List;
/**
* 发货单明细表 服务类
*
* @author hzs
* @since 2022-08-31
*/
public interface ISaDeliverItemsService extends IService<SaDeliverItems> {
@ -40,18 +37,7 @@ public interface ISaDeliverItemsService extends IService<SaDeliverItems> {
Integer pkCountry);
/*
* @description: 查询订单是否绑定追溯码
* @author: sui q
* @date: 2023/7/21 17:02
* @param: null null
**/
Boolean validateOrderBindBarCode(String orderCode, List<Long> itemIdList);
/*
* @description: 删除发货单
* @author: sui q
* @date: 2023/9/14 15:47
* @param: null null
* 删除发货单
**/
void deleteSaDeliverItems(Long pkOrder, List<Long> pkOrderItemsList);

13
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.hzs.sale.deliver.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.enums.EYesNo;
@ -15,9 +14,6 @@ import java.util.List;
/**
* 发货单明细表 服务实现类
*
* @author hzs
* @since 2022-08-31
*/
@Service
public class SaDeliverItemsServiceImpl extends ServiceImpl<SaDeliverItemsMapper, SaDeliverItems> implements ISaDeliverItemsService {
@ -35,15 +31,6 @@ public class SaDeliverItemsServiceImpl extends ServiceImpl<SaDeliverItemsMapper,
return baseMapper.queryDeliverItemsByOrder(pkOrder, pkOrderItemList, orderStatusList, pkCountry);
}
@Override
public Boolean validateOrderBindBarCode(String orderCode, List<Long> itemIdList) {
List<SaDeliverItems> saDeliverItems = baseMapper.querySaDeliverItemByOrder(orderCode, itemIdList);
if (CollectionUtil.isNotEmpty(saDeliverItems)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
}
@Override
public void deleteSaDeliverItems(Long pkOrder, List<Long> pkOrderItemsList) {
LambdaUpdateWrapper<SaDeliverItems> updateWrapper = new LambdaUpdateWrapper<>();

34
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -45,11 +45,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 我的订单控制器
* @Author: jiang chao
* @Time: 2023/1/13 15:53
* @Classname: ApiOrderController
* @PackageName: com.hzs.sale.order.controller.api
* 我的订单控制器
*/
@Slf4j
@RestController
@ -520,11 +516,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助撤单列表(24点内)
* @author: zhang jing
* @date: 2023/11/21 10:33
* @param: [param]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助撤单列表(24点内)
**/
@GetMapping("/selfRevokeList")
public TableDataInfo selfRevokeList(MyOrderParam param) {
@ -552,37 +544,19 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自动撤单参数校验
* @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));
}
List<Long> itemIdList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(myOrderVO.getItemList())) {
myOrderVO.getItemList().forEach(itm -> {
itemIdList.add(itm.getPkId());
});
}
if (saDeliverItemsService.validateOrderBindBarCode(myOrderVO.getOrderCode(), itemIdList)) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_BIND_BAR_CODE));
}
return AjaxResult.success();
}
/**
* @description: 自助撤单
* @author: zhang jing
* @date: 2023/11/21 15:19
* @param: [orderCancelParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 自助撤单w
**/
@PostMapping("/self-revoke-order")
public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) {

9
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java
View File

@ -1175,11 +1175,9 @@ public class SaOrderBusinessController extends BaseController {
}
/**
* 撤销订单
*
* @param orderQueryParam 订单参数
* @Description: 撤销订单
* @return: AjaxResult
* @Author: sui q
* @Date: 2022/8/27 16:56
*/
@PostMapping("/validate-bind")
public AjaxResult validateOrderBindBarCode(@RequestBody OrderQueryParam orderQueryParam) {
@ -1188,9 +1186,6 @@ public class SaOrderBusinessController extends BaseController {
if (StringUtils.isEmpty(orderQueryParam.getOrderCode())) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CODE_EMPTY));
}
if (saDeliverItemsService.validateOrderBindBarCode(orderQueryParam.getOrderCode(), orderQueryParam.getItemIdList())) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_BIND_BAR_CODE));
}
return AjaxResult.success();
}
}

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

@ -2349,14 +2349,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
return null;
}
/**
* @description: 校验自助撤单
* @author: zhang jing
* @date: 2023/11/21 15:23
* @param: [orderCancelParam, businessCode]
* @return: com.hzs.sale.order.vo.ValidateCancelOrderVO
**/
@Override
public MyOrderVO checkSelfOrder(Long userId, MyOrderVO myOrderVO) {
if (null == myOrderVO.getOrderType() || null == myOrderVO.getOrderCode()) {

16
bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml
View File

@ -506,20 +506,4 @@
)
</select>
<select id="querySaDeliverItemByOrder" resultType="com.hzs.common.domain.sale.deliver.SaDeliverItems">
select sdi.pk_id from sa_order so
inner join sa_deliver_items sdi
on so.pk_id =sdi.pk_order
inner join sa_deliver_bar_code sdc
on sdi.pk_id=sdc.pk_deliver_items
where sdi.del_flag=0 and sdc.del_flag=0
and so.order_code = #{orderCode}
<if test="itemIdList != null and itemIdList.size >0">
and sdi.pk_order_items in
<foreach collection="itemIdList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
</mapper>

3
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java
View File

@ -1,13 +1,10 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 撤销订单类型
*
* @author: hzs
*/
@AllArgsConstructor
@Getter

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/deliver/SaDeliverItems.java
View File

@ -10,9 +10,6 @@ import lombok.experimental.Accessors;
/**
* 发货单明细表
*
* @author hzs
* @since 2022-08-31
*/
@Data
@EqualsAndHashCode(callSuper = true)