修改会员设置

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -4,6 +4,8 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -43,6 +45,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Autowired
     AppUserDetailBiz detailBiz;
 
+    @Autowired
+    private BaseUserMemberLevelMapper BaseUserMemberLevelMapper;
+
 //    @Autowired
 //    private TaskExecutor taskExecutor;
 //
@@ -213,7 +218,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     }
 
 
-
     /**
      * 设置用户会员
      *
@@ -230,7 +234,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         if (totalNumber < freeDays) {
             freeDays = totalNumber;
         }
-        Integer buyCount = userMemberDTO.getBuyCount() == null ? 1:userMemberDTO.getBuyCount() ;
+
+        if (userMemberDTO.getMemberLevel() != null) {
+            Example exa = new Example(BaseUserMember.class);
+            Example.Criteria criteria = exa.createCriteria();
+            criteria.andEqualTo("isDel", 0);
+            criteria.andEqualTo(userMemberDTO.getMemberLevel());
+            List<BaseUserMemberLevel> levels = BaseUserMemberLevelMapper.selectByExample(exa);
+            if (CollectionUtils.isEmpty(levels)) {
+                log.error("错误!设置的该等级会员不存在.");
+                throw new BaseException("错误!设置的该等级会员不存在。");
+            }else if (levels.size()>1){
+                log.error("错误!该等级的会员存在多个。");
+                throw new BaseException("错误!该等级的会员存在多个。");
+            }else {
+                baseUserMember.setDiscount(levels.get(0).getDiscount());
+            }
+        }
+
+        Integer buyCount = userMemberDTO.getBuyCount() == null ? 1 : userMemberDTO.getBuyCount();
         UserMemberVo userMemberVo = getMemberInfoByUserId(userMemberDTO.getUserId());
         if (userMemberVo == null) {
             baseUserMember.setRentFreeDays(freeDays);
@@ -241,8 +263,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             Integer number = userMemberVo.getTotalNumber() == null ? 0 : userMemberVo.getTotalNumber();
             Integer days = userMemberVo.getRentFreeDays() == null ? 0 : userMemberVo.getRentFreeDays();
             baseUserMember.setBuyCount(userMemberVo.getBuyCount() + buyCount);
-            number=(totalNumber-number)+number;
-            days=(freeDays-days)+days;
+            number = (totalNumber - number) + number;
+            days = (freeDays - days) + days;
             baseUserMember.setTotalNumber(number);
             baseUserMember.setRentFreeDays(days);
             getMyBiz().updateSelectiveById(baseUserMember);
@@ -255,14 +277,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             userVo1.setIsMember(1);
             detailBiz.updUuserInfoById(userVo1);
         }
-
     }
 
 
     public void deleteByUserIds(Collection<Integer> userIds) {
         Example example = new Example(BaseUserMember.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("userId",userIds);
+        criteria.andIn("userId", userIds);
         mapper.deleteByExample(example);
     }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberLevelMapper.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
  * @email nishijjo@qq.com
  * @date 2019-06-11 11:06:45
  */
+@Repository
 public interface BaseUserMemberLevelMapper extends Mapper<BaseUserMemberLevel> {
 
     List<BaseUserMemberLevel> selectUserMembersLevelByLevels(@Param("levels") List<Integer> levels);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -357,7 +357,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
@@ -370,7 +370,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);