## 自助撤单是否最新订单判断调整；

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

@@ -106,7 +106,7 @@ public class MemberServiceProvider implements IMemberServiceApi {
             if (iCuMemberBusinessService.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, saOrderMap, businessCommissionDTO)) {
                 return R.ok();
             }
-            return R.fail("会员信息处理失败");
+            return R.fail("合并撤单会员信息处理失败");
         } catch (Exception e) {
             log.error("mergeRevokeMemberByRegisterOrder error msg:{}", e.getMessage(), e);
             return R.fail(e.getMessage());
@@ -116,10 +116,13 @@ public class MemberServiceProvider implements IMemberServiceApi {
     @Override
     public R<Boolean> normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, BusinessCommissionDTO businessCommissionDTO) {
         try {
-            return R.ok(iCuMemberBusinessService.normalRevokeOrder(pkApprove, saOrder, cuMember, businessCommissionDTO));
+            if (iCuMemberBusinessService.normalRevokeOrder(pkApprove, saOrder, cuMember, businessCommissionDTO)) {
+                return R.ok();
+            }
+            return R.fail("其它撤单会员信息处理失败");
         } catch (Exception e) {
             log.error("normalRevokeOrder error msg: {}", e.getMessage(), e);
-            return R.ok(false);
+            return R.fail(e.getMessage());
         }
     }
 

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

@@ -618,7 +618,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
             updateWrapper.set(CuMember::getPkModified, saOrder.getPkModified());
             updateWrapper.eq(CuMember::getPkId, member.getPkId());
             iCuMemberService.update(updateWrapper);
-
             // 删除会员注册表
             LambdaUpdateWrapper<CuMemberRegister> updateWrapperRegister = new LambdaUpdateWrapper<>();
             updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue());
@@ -853,6 +852,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
             SaOrderExt saOrder = saOrderMap.get(pkMember);
             // 删除等级
             iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
+            // 删除会员区域
+            iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
+                    .eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
+                    .set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
+                    .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
+            );
             // 回退奖衔,根据订单从 cu_member_awards查询
             iCuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
             iCuMemberService.deleteCuMemberByPkMember(pkMember, pkApprove, currentDateTime);
@@ -899,12 +904,26 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
             // 升级订单
             // 回退等级
             iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
-            // 删除会员区域
-            iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
-                    .eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
-                    .set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
-                    .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
-            );
+            // 如果会员等级非代理，则需要删除会员区域
+            GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
+            if (gradeDTO.getGradeValue() != EGrade.REGION.getValue()
+                    && gradeDTO.getGradeValue() != EGrade.DIRECTOR.getValue()) {
+                // 删除会员区域选择
+                iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
+                        .eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
+                        .eq(CuMemberRetailRegion::getBusinessType, 1)
+                        .set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
+                        .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
+                );
+                // 更新会员配送中心为失效
+                iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
+                        .eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
+                        .eq(CuMemberRetailRegion::getBusinessType, 2)
+                        .set(CuMemberRetailRegion::getEffective, EYesNo.NO.getIntValue())
+                        .set(CuMemberRetailRegion::getEffectiveEndDate, DateUtils.getEndTime(null))
+                        .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
+                );
+            }
         }
 
         // 更新会员标记，如果是则更新会员信息

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

@@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hzs.bonus.settle.IMemberSettleBonusApi;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.constant.msg.*;
@@ -2356,8 +2355,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
             return myOrderVO;
         }
         if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() ||
-                myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue() ||
-                myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue()) {
+                myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue()) {
             String lastOrderCode = iSaOrderService.lastOrderList(userId, myOrderVO.getPkCountry());
             if (StringUtils.isEmpty(lastOrderCode) || !lastOrderCode.equals(myOrderVO.getOrderCode())) {
                 myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LAST_ORDER));
@@ -2397,7 +2395,8 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         }
         // 校验订单是否存在进行中的签呈
         if (iSaOrderChargeLogService.checkOrderApprovalExist(
-                Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(), EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
+                Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(),
+                        EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
                         EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness,
                         EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
                 ),

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

@@ -2119,8 +2119,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
 //            iSaOrderWaresLimitService.updateCancelOrder(saOrderExt.getPkId(), saOrderExt.getPkMember(), saOrderExt.getModifiedTime(), boxProductList);
 //        }
 
-        if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) {
-            throw new ServiceException("撤单处理会员失败");
+        R<Boolean> tmpR = iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO);
+        if (!tmpR.isSuccess()) {
+            throw new ServiceException("撤单失败 " + tmpR.getMsg());
         }
     }
 

bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml

@@ -320,7 +320,7 @@
         soi.soi.wares_quantity,
         bc.in_exchange_rate,
         case
-        when soi.order_status in (1, 2) then
+        when soi.order_status in (1, 2, 6) then
         0
         else
         1
@@ -1197,12 +1197,12 @@
                           LEFT JOIN sa_order_items soi ON soi.pk_order = so.pk_id
                      AND soi.del_flag = 0
                  WHERE so.del_flag = 0
-                   and so.order_type in (41, 42,43)
+                   and so.order_type in (41, 42)
                    and soi.del_flag = 0
                    and so.ORDER_STATUS = 1
                    and so.PAY_TIME is not null
                    and (so.pk_creator = #{memberId} or so.pk_member = #{memberId})
-                   AND soi.order_status = 1
+                   AND soi.order_status in (1, 6)
                  ORDER BY so.PAY_TIME DESC
              )
         WHERE ROWNUM = 1

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java

@@ -150,11 +150,6 @@ public class SaOrderMsgConstants {
      * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买
      */
     public static final String ORDER_ITEM_OFF = "订单下商品已下架，不能购买";
-
-    /**
-     * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单已经绑定条形码，建议解绑后在撤单！
-     */
-    public static final String ORDER_BIND_BAR_CODE = "订单已经绑定条形码，建议解绑后在撤单！";
     /**
      * 请填写驳回信息 -- 请填写驳回信息
      */
@@ -168,9 +163,4 @@ public class SaOrderMsgConstants {
      */
     public static final String CHECK_MEMBER_LOWER_EXIST = "该会员推荐存在会员不能撤单";
 
-    /**
-     * 商品预售数量不足
-     */
-    public static final String WARES_PRE_SALE_QUANTITY_LACK = "商品预售数量不足";
-
 }