bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java

@@ -14,7 +14,6 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -269,5 +268,4 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
      */
     CuMemberAccountExt queryAccountSummaryByVertex(@Param("pkVertex") Long pkVertex, @Param("pkCountry") Integer pkCountry);
 
-    void deleteCuMemberAccountByMemberCode(@Param("userId") Long userId, @Param("date")Date date, @Param("memberCode")String memberCode);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java

@@ -331,5 +331,4 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
      */
     CuMemberAccountExt queryAccountSummaryByVertex(Long pkVertex, Integer pkCountry);
 
-    void deleteCuMemberAccountByMemberCode(Long userId, Date date, String memberCode);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java

@@ -841,10 +841,5 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
         return baseMapper.queryAccountSummaryByVertex(pkVertex, pkCountry);
     }
 
-    @Override
-    public void deleteCuMemberAccountByMemberCode(Long userId, Date date, String memberCode) {
-        baseMapper.deleteCuMemberAccountByMemberCode(userId,date,memberCode);
-    }
-
 }
 

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java

@@ -1,50 +0,0 @@
-package com.hzs.member.base.controller.manage;
-
-
-import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.enums.EOperationMethod;
-import com.hzs.common.core.enums.EOperationModule;
-import com.hzs.common.core.web.controller.BaseController;
-import com.hzs.common.core.web.domain.AjaxResult;
-import com.hzs.common.core.web.page.TableDataInfo;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.member.base.param.DeleteDeadLockParam;
-import com.hzs.member.base.service.DeleteDeadLockService;
-import com.hzs.member.base.vo.DeleteDeadLockVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RequestMapping("/manager/deleteDeadLock")
-@RestController
-public class DeleteDeadLockController extends BaseController {
-
-    @Autowired
-    private DeleteDeadLockService deleteDeadLockService;
-
-    /**
-     * 删除死点列表
-     */
-    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.SELECT)
-    @GetMapping("list")
-    public TableDataInfo list(DeleteDeadLockParam deleteDeadLockParam) {
-        startPage();
-        deleteDeadLockParam.setPkCountry(SecurityUtils.getPkCountry());
-        List<DeleteDeadLockVO> DeleteDeadLockList = deleteDeadLockService.queryDeleteDeadLockList(deleteDeadLockParam.getMemberCode());
-        return getDataTable(DeleteDeadLockList);
-    }
-
-    /**
-     * 删除死点
-     */
-    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.DELETE)
-    @PostMapping("delete")
-    public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) {
-        String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam);
-        if (check == null) {
-            return AjaxResult.success();
-        }
-        return AjaxResult.error(check);
-    }
-}

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

@@ -791,7 +791,4 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
                               @Param("pkGrade") Integer pkGrade,
                               @Param("pkCountry") Integer pkCountry);
 
-    List<DeleteDeadLockVO> queryDeleteDeadLockList(@Param("memberCode") String memberCode);
-
-    Integer queryIsDeadMember(@Param("memberCode") String memberCode);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java

@@ -1,25 +0,0 @@
-package com.hzs.member.base.param;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DeleteDeadLockParam {
-
-    /**
-     * 会员编号
-     */
-    private String memberCode;
-
-    /**
-     * 所属国家
-     */
-    private Integer PkCountry;
-
-}

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

@@ -1,13 +0,0 @@
-package com.hzs.member.base.service;
-
-import com.hzs.member.base.param.DeleteDeadLockParam;
-import com.hzs.member.base.vo.DeleteDeadLockVO;
-
-import java.util.List;
-
-public interface DeleteDeadLockService {
-    List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode);
-
-    String deleteDeadLockMember(DeleteDeadLockParam deleteDeadLockParam);
-
-}

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

@@ -1,64 +0,0 @@
-package com.hzs.member.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.constant.msg.MemberMsgConstants;
-import com.hzs.common.core.enums.EDelFlag;
-import com.hzs.common.core.enums.EPlaceDept;
-import com.hzs.common.domain.member.base.CuMember;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.member.account.service.ICuMemberAccountService;
-import com.hzs.member.base.mapper.CuMemberMapper;
-import com.hzs.member.base.param.DeleteDeadLockParam;
-import com.hzs.member.base.service.DeleteDeadLockService;
-import com.hzs.member.base.vo.DeleteDeadLockVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-@Slf4j
-public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements DeleteDeadLockService {
-    @Autowired
-    private ICuMemberAccountService iCuMemberAccountService;
-
-    @Override
-    public List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode) {
-        List<DeleteDeadLockVO> deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode);
-        deleteDeadLockVOList.forEach(deleteDeadLockVO -> {
-            deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept())));
-        });
-        return deleteDeadLockVOList;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String deleteDeadLockMember(DeleteDeadLockParam deleteDeadLockParam) {
-        if (deleteDeadLockParam.getMemberCode() == null) {
-            return MemberMsgConstants.REQUIRED_NOT_EMPTY;
-        }
-        // 查询安置伞下和推荐伞下未删除会员数量,如果未删除会员数量为0返回true
-        Integer isNoDeadNum = baseMapper.queryIsDeadMember(deleteDeadLockParam.getMemberCode());
-        log.info("安置伞下和推荐伞下未删除会员数量:{}",isNoDeadNum);
-        if(isNoDeadNum == 0){
-            // 删除操作
-            Long userId = SecurityUtils.getUserId();
-            Date date=new Date();//此时date为当前的时间
-            // 删除会员
-            baseMapper.update(null,new LambdaUpdateWrapper<CuMember>()
-                    .eq(CuMember::getMemberCode,deleteDeadLockParam.getMemberCode())
-                    .set(CuMember::getPkModified,userId)
-                    .set(CuMember::getModifiedTime,date)
-                    .set(CuMember::getDelFlag, EDelFlag.DELETE.getValue()));
-            // 删除会员账户
-            iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
-        } else {
-            return MemberMsgConstants.NOT_DEAD_MEMBER;
-        }
-        return null;
-    }
-}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java

@@ -1,48 +0,0 @@
-package com.hzs.member.base.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@AllArgsConstructor
-@NoArgsConstructor
-public class DeleteDeadLockVO {
-
-    /**
-     * 会员编号
-     */
-    private String memberCode;
-
-    /**
-     * 会员姓名
-     */
-    private String memberName;
-    /**
-     * 结算等级
-     */
-    private String pkSettleGrade;
-    /**
-     * 推荐人编号
-     */
-    private String parMemberCode;
-    /**
-     * 安置人编号
-     */
-    private String placeMemberCode;
-    /**
-     * 安置位置
-     */
-    private String placeDept;
-    /**
-     * 注册时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date creationTime;
-}

bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml

@@ -69,14 +69,6 @@
         <result column="ACCOUNT_STATUS" property="accountStatus"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
     </resultMap>
-    <update id="deleteCuMemberAccountByMemberCode">
-        update cu_member_account cma
-        set cma.del_flag = 1,cma.PK_MODIFIED = #{userId},cma.MODIFIED_TIME = #{date}
-        where cma.pk_member in
-              (select cm.pk_id
-               from cu_member cm
-               where cm.member_code = #{memberCode})
-    </update>
 
     <select id="queryMemberAccountByCondition" resultMap="AccountExResultMap">
         select cm.pay_pwd,

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

@@ -3191,45 +3191,6 @@
         </foreach>)
         order by num desc
     </select>
-    <select id="queryDeleteDeadLockList" resultType="com.hzs.member.base.vo.DeleteDeadLockVO">
+
-        SELECT
-        cu.MEMBER_CODE,
-        cu.MEMBER_NAME，bdg.GRADE_NAME as pkSettleGrade,
-        cus.MEMBER_CODE AS parMemberCode,
-        cuss.MEMBER_CODE AS placeMemberCode，cu.PLACE_DEPT,
-        cu.CREATION_TIME
-        FROM
-        CU_MEMBER cu
-        LEFT JOIN CU_MEMBER cus ON cu.PK_PARENT = cus.PK_ID
-        LEFT JOIN CU_MEMBER cuss ON cu.PK_PLACE_PARENT = cuss.PK_ID
-        LEFT JOIN BD_GRADE bdg ON cu.PK_SETTLE_GRADE = bdg.PK_ID
-        WHERE
-        cu.DEL_FLAG = 0
-        AND cu.CATEGORY = 2
-        <if test="memberCode != null and memberCode != ''">
-        AND cu.MEMBER_CODE = #{memberCode}
-        </if>
-    </select>
-    <select id="queryIsDeadMember" resultType="java.lang.Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            (
-                SELECT
-                    MEMBER_CODE
-                FROM
-                    CU_MEMBER
-                WHERE
-                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT UNION ALL
-                SELECT
-                    MEMBER_CODE
-                FROM
-                    CU_MEMBER
-                WHERE
-                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
-            ) t
-        WHERE
-            t.MEMBER_CODE != #{memberCode}
-    </select>
 
 </mapper>

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

@@ -575,12 +575,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         // 查询订单信息
         SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
         if (null == saOrder) {
-            return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
+            return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
         }
         // 订单支付日期 < 当前日期-7天
         Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
         if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
-            return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
+            return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
         }
 
         // 操作日志内容
@@ -646,13 +646,16 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
             return "订单已经发货，不能进行调换货物";
         }
 
+        // 是否扣款
+        boolean orderCostFlag = false;
         // 修改前的订单金额 + 邮费
         BigDecimal beforeAmount = saOrder.getOrderAmount().add(saOrder.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
         // 修改后的订单金额 + 邮费
         BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        // 校验订单原订单价格和调换完货之后的价格不相同不进行换货
+        // 对比修改前后订单价格处理是否补差价
         if (beforeAmount.compareTo(afterAmount) != 0) {
-            return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
+            // 修改前后金额不相同则进行处理
+            orderCostFlag = true;
         }
 
         if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@@ -661,7 +664,13 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
                     changeIdList, noChangeIdList,
                     userId, pkCountry, nowDate);
 
-            if (null != dto) {
+            if (orderCostFlag) {
+                // 订单调换货物扣费处理
+                R<?> resultR = iMemberAccountServiceApi.orderChangeProduct(saOrder, updateOrder, userId, dto);
+                if (!resultR.isSuccess()) {
+                    throw new BaseException(resultR.getMsg());
+                }
+            } else if (null != dto) {
                 // 订单总价未变化，但是需要手续费
                 R<?> resultR = iMemberAccountServiceApi.orderChangeProduct(null, null, userId, dto);
                 if (!resultR.isSuccess()) {
@@ -694,12 +703,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         // 查询订单收货地址信息
         SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
         if (null == saOrder) {
-            return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
+            return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
         }
         // 订单支付日期 < 当前日期-7天
         Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
         if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
-            return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
+            return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
         }
 
         // 涉及会员ID列表
@@ -745,9 +754,25 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         ;
         // 修改后的订单金额 + 邮费
         BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        // 校验订单原订单价格和调换完货之后的价格不相同不进行换货
+        ;
-        if (beforeAmount.compareTo(afterAmount) != 0) {
+        // 对比修改前后订单价格处理是否补差价
-            return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
+        if (beforeAmount.compareTo(afterAmount) < 0) {
+            // 存在差额
+            // 封装订单数据
+            SaOrder updateOrder = BeanUtil.copyProperties(saOrder, SaOrder.class);
+            updateOrder.setPkId(saOrder.getPkId());
+            updateOrder.setOrderAmount(afterData.getOrderAmount());
+            updateOrder.setOrderAchieve(afterData.getOrderAchieve());
+            updateOrder.setOrderAssAchieve(afterData.getOrderAssAchieve());
+            updateOrder.setPostage(param.getPostage());
+            updateOrder.setPkModified(userId);
+            updateOrder.setModifiedTime(nowDate);
+
+            // 校验订单支付金额是否足够
+            R<?> resultR = iMemberAccountServiceApi.orderChangeProductPre(saOrder, updateOrder);
+            if (!resultR.isSuccess()) {
+                return resultR.getMsg();
+            }
         }
 
         if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@@ -761,7 +786,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
             }
             return submitStr;
         }
-        return CommonMsgConstants.OPERATION_FAILED;
+        return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED);
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -287,9 +287,5 @@ public class MemberMsgConstants {
      * 已超最大门票销售数量，不能购买！
      */
     public static final String NOT_CHECK_AC_ACTIVITY = "门票数量已售罄，请稍后再试！";
-    /**
-     * 会员安置伞下和推荐伞下还有未删除会员，不可删除
-     */
-    public static final String NOT_DEAD_MEMBER = "会员安置伞下和推荐伞下还有未删除会员，不可删除";
 
 }

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

@@ -169,10 +169,5 @@ public class SaOrderMsgConstants {
      * 会员续约 -- 已终止会员不允许报单
      */
     public static final String TERMINATED_NOT_DECLARATION = "已终止会员不允许报单";
-    /**
-     * 原订单价格和调换完货之后的价格不相同 -- 不允许货物调换
-     */
-    public static final String PRODUCT_CONFIRM_PRICE = "原订单价格和调换完货之后的价格不相同";
-
 
 }

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

@@ -425,8 +425,6 @@ public enum EOperationModule {
 
     CANCEL_ORDER_CONFIRM("撤销订单确认"),
 
-    DELETE_DEAD_LOCK("删除死点"),
-
     ///////////////////////////统计分析////////////////////////////
 
     STATISTIC_ANALYSIS("统计分析"),