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

@@ -96,6 +96,13 @@ public interface IMemberServiceApi {
      */
     R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, String memberCode, String phone);
 
+    /**
+     * 查找安置人伞上会员信息
+     *
+     * @param memberId 编号、安置人
+     */
+    R<List<CuMemberExt>> querySponsorOnUmbrella(Long memberId, List<String> memberCodeList);
+
     /**
      * 查找安置人伞下
      *
@@ -261,6 +268,15 @@ 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值
      **/

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

@@ -50,6 +50,13 @@ 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);
+
     /**
      * 查找安置人伞下
      *
@@ -270,6 +277,15 @@ 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);
+
     /**
      * 校验会员编号是否存在
      *

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

@@ -130,6 +130,11 @@ 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));
@@ -268,6 +273,11 @@ 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);

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

@@ -108,6 +108,13 @@ 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);
+
     /**
      * 查找安置人伞下
      *
@@ -476,6 +483,15 @@ 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);
+
     /**
      * 校验会员编号是否存在
      *

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

@@ -588,7 +588,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
         deductCancelOrderCost(businessCommissionDTO);
-        Date currentDateTime = DateUtils.currentDateTime();
 
         CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
 
@@ -609,9 +608,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
             iCuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
         }
 
-        // 处理推荐人等级
-        handleParentLevel(saOrder, currentDateTime);
-
         cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
         return true;
     }
@@ -648,6 +644,14 @@ 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) {
@@ -907,7 +911,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
             }
         }
 
-        // 处理推荐人等级
         this.handleParentLevel(saOrder, currentDateTime);
 
         // 部分撤单 todo  发货后邮费不退，未发货退邮费

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

@@ -202,6 +202,11 @@ 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);
@@ -2385,6 +2390,11 @@ 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<>();

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

@@ -1528,6 +1528,15 @@
 
     </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
@@ -2051,6 +2060,17 @@
           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">

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

@@ -11,6 +11,9 @@ import java.util.List;
 
 /**
  * 发货单明细表 Mapper 接口
+ *
+ * @author hzs
+ * @since 2022-08-31
  */
 public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
 
@@ -23,6 +26,7 @@ public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
      */
     List<DeliverHandledVO> queryDeliverHandledList(@Param("param") DeliverHandledParam param, @Param("pkCountry") Integer pkCountry);
 
+
     /**
      * 批量插入
      *
@@ -59,4 +63,12 @@ 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);
+
 }

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

@@ -8,6 +8,9 @@ import java.util.List;
 
 /**
  * 发货单明细表 服务类
+ *
+ * @author hzs
+ * @since 2022-08-31
  */
 public interface ISaDeliverItemsService extends IService<SaDeliverItems> {
 
@@ -37,7 +40,18 @@ 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);
 

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

@@ -1,5 +1,6 @@
 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;
@@ -14,6 +15,9 @@ import java.util.List;
 
 /**
  * 发货单明细表 服务实现类
+ *
+ * @author hzs
+ * @since 2022-08-31
  */
 @Service
 public class SaDeliverItemsServiceImpl extends ServiceImpl<SaDeliverItemsMapper, SaDeliverItems> implements ISaDeliverItemsService {
@@ -31,6 +35,15 @@ 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<>();

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

@@ -45,7 +45,11 @@ 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
@@ -516,7 +520,11 @@ public class ApiOrderController extends BaseController {
     }
 
     /**
-     * 自助撤单列表(24点内)
+     * @description: 自助撤单列表(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) {
@@ -544,19 +552,37 @@ 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();
     }
 
     /**
-     * 自助撤单w
+     * @description: 自助撤单
+     * @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) {

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

@@ -946,17 +946,17 @@ public class SaOrderBusinessController extends BaseController {
 //                    orderCancelDetailVOList.add(orderCancelDetailVO);
 //                });
 //            } else {
-            saOrderExt.getOrderItemsExtList().forEach(saOrderItems -> {
+                saOrderExt.getOrderItemsExtList().forEach(saOrderItems -> {
-                OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder()
+                    OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder()
-                        .pkId(saOrderItems.getPkId())
+                            .pkId(saOrderItems.getPkId())
-                        .productName(saOrderItems.getProductName())
+                            .productName(saOrderItems.getProductName())
-                        .orderAmount(saOrderItems.getPrice())
+                            .orderAmount(saOrderItems.getPrice())
-                        .number(saOrderItems.getQuantity())
+                            .number(saOrderItems.getQuantity())
-                        .achievement(saOrderItems.getAchievement())
+                            .achievement(saOrderItems.getAchievement())
-                        .assAchievement(saOrderItems.getAssAchievement())
+                            .assAchievement(saOrderItems.getAssAchievement())
-                        .build();
+                            .build();
-                orderCancelDetailVOList.add(orderCancelDetailVO);
+                    orderCancelDetailVOList.add(orderCancelDetailVO);
-            });
+                });
 //            }
             orderCancelVO.setOrderCancelDetailVOList(orderCancelDetailVOList);
             orderCancelVO.setMemberCode(saOrderExt.getMemberCode());
@@ -1175,9 +1175,11 @@ 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) {
@@ -1186,6 +1188,9 @@ 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();
     }
 }

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

@@ -2349,6 +2349,14 @@ 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()) {

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

@@ -506,4 +506,20 @@
         )
     </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>

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

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

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

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