Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -106,19 +106,12 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
             }
             Integer userid=entity.getUserid();
             AppUserLogin appUserLogin=new AppUserLogin();
-            if (StringUtils.isNotBlank(userVo.getWxOpenid())){
             appUserLogin.setWxOpenid(userVo.getWxOpenid());
             appUserLogin.setUnionid(userVo.getUnionid());
-            }
-            if (StringUtils.isNotBlank(userVo.getOpenid())){
             appUserLogin.setOpenid(userVo.getOpenid());
-            }
-            if (appUserLogin!=null){
             appUserLogin.setId(userid);
             appUserLogin.setUsername(userVo.getUsername());
-                userLoginBiz.updateSelectiveById(appUserLogin);
-            }
-
+            userLoginBiz.bindOpenid(appUserLogin);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -48,6 +48,11 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         super.updateSelectiveById(entity);
     }
 
+    @CacheClear(pre = "user{1.username}")
+    public int bindOpenid(AppUserLogin entity) {
+        return  mapper.bindOpenId(entity);
+    }
+
     @CacheClear(pre = "user{1.username}")
     public void updatePasswordById(AppUserLogin entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());

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

@@ -146,14 +146,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 if (freeDays > 0 && freeDays >= days) {
                     freeDays = freeDays - days;
                     baseUserMember.setRentFreeDays(freeDays);
+                    }
                     Integer payCount = userMemberVo.getPayCount() == null ? 0 : userMemberVo.getPayCount();
-                    if (days > 0) {
+                   /* if (days > 0) {
                         payCount = payCount + 1;
-                    }
+                    }*/
                     baseUserMember.setPayCount(payCount);
                     getMyBiz().updateSelectiveById(baseUserMember);
                     num = freeDays;
-                }
             } else if (type == 2) {
                     /*Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
                     payCount=payCount+1;

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

@@ -22,4 +22,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
     void updateLoginUserInfoById(@Param("userId") Integer userId,@Param("ip") String ip, @Param("lastTime") long lastTime);
 
     List<AppUserLogin> selectbyPhones(@Param("phones") List<String> phones);
+
+   int  bindOpenId(AppUserLogin appUserLogin);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml

@@ -8,4 +8,8 @@
           #{phone}
         </foreach>
     </select>
+    
+    <update id="bindOpenId" parameterType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
+        UPDATE  app_user_login SET wx_openid=#{wxOpenid},unionid=#{unionid},openid=#{openid} where  id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -242,4 +242,11 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "使用的优惠券票号，逗号分割")
 	@Column(name = "coupon_ticker_nos")
 	private String couponTickerNos;
+
+	/**
+	 * 下单时的会员等级
+	 */
+	@ApiModelProperty(value = "下单时的会员等级")
+	@Column(name = "member_level")
+	private Integer memberLevel;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

 package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -25,7 +27,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @Transactional
-public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends OrderDetail>{
+public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends OrderDetail> implements UserRestInterface {
 
     public static final int VERSION_INITIAL = 0;
 
@@ -46,6 +48,14 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
     @Autowired
     ActivityFeign activityFeign;
 
+    @Autowired
+    protected UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     protected OrderTypeEnum orderTypeEnum;
 
     protected Integer channel;
@@ -76,6 +86,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
 
         //设置用户id
         baseOrder.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+        baseOrder.setMemberLevel(getAppUser().getMemberLevel());
         return baseOrder;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -39,7 +40,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
 @Log4j
-public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz, MemberBO> {
+public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz, MemberBO> implements UserRestInterface {
 
     @Autowired
     TourFeign tourFeign;
@@ -65,9 +66,6 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
-    @Autowired
-    UserFeign userFeign;
-
     @Autowired
     ActivityFeign activityFeign;
 
@@ -79,10 +77,6 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         this.orderTypeEnum = OrderTypeEnum.MEMBER;
     }
 
-    public AppUserDTO getUserInfo(){
-        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
-    }
-
     @Override
     public void initDetail(MemberBO bo) {
         super.initDetail(bo);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -33,6 +33,7 @@ import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -72,9 +73,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     @Autowired
     OrderTemplateBiz orderTemplateBiz;
 
-    @Autowired
-    UserFeign userFeign;
-
     @Autowired
     ThirdFeign thirdFeign;
 
@@ -136,8 +134,12 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //设置订单名称
         bo.getOrder().setName(bo.getVehicleModel().getName());
 
+        //是否有使用会员权益 则调用接口触发新增消费记录次数
             //扣减免费天数
-        if(null != bo.getFreeDays() && bo.getFreeDays() > 0) {
+        if(SYS_TRUE.equals(bo.getOrder().getHasMemberRight())) {
+            if(null == bo.getFreeDays()) {
+                bo.setFreeDays(0);
+            }
             int result = userFeign.memberDays(bo.getAppUserDTO().getUserid(), bo.getFreeDays(), UserFeign.MEMBER_DAYS_LOCK);
             if(result < 0) {
                 throw new BaseException(ResultCode.FAILED_CODE);
@@ -224,21 +226,23 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");
-            switch (MemberEnum.getByCode(detail.getAppUserDTO().getMemberLevel())) {
+            HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+            switch (MemberEnum.getByCode(dto.getMemberLevel())) {
                 case NORMAL:
-                    modelAmount = handleDiscount(vehicleModel, prices, NORMAL);
+                    handleDiscountDTO = handleDiscount(vehicleModel, prices, NORMAL);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                 break;
                 case GOLD:
-                    modelAmount = handleDiscount(vehicleModel, prices, GOLD);
+                    handleDiscountDTO = handleDiscount(vehicleModel, prices, GOLD);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
                 case DIAMOND:
-                    modelAmount = handleDiscount(vehicleModel, prices, DIAMOND);
+                    handleDiscountDTO = handleDiscount(vehicleModel, prices, DIAMOND);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
             }
-            vehicleOrderItem.setUnitPrice(modelAmount);
+            detail.setRebate(handleDiscountDTO.getRebate());
+            vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());
         }else {
             modelAmount = vehicleModel.getPrice();
         }
@@ -311,15 +315,29 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @param memberEnum
      * @return
      */
-    private BigDecimal handleDiscount(VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
+    private HandleDiscountDTO handleDiscount(VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
         BigDecimal modelAmount;//会员比例
+        BigDecimal hundred = BigDecimal.TEN;
+        Integer rebate = new Integer(0);
         if(DISCOUNT_STATUS_MEMBER.equals(vehicleModel.getRentDiscountStatus())) {
-            modelAmount = new BigDecimal(String.valueOf((memberEnum.getPercent()/100d))).multiply(vehicleModel.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            rebate = memberEnum.getPercent();
+            BigDecimal rebatePercent = new BigDecimal(String.valueOf((rebate/100d)));
+            modelAmount = rebatePercent.multiply(vehicleModel.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
         }else {
             //会员固定价列表
             modelAmount = new BigDecimal(prices[(memberEnum.getCode() - 1)]);
+            rebate = modelAmount.divide(vehicleModel.getPrice()).multiply(hundred).setScale(0, BigDecimal.ROUND_UP).intValue();
         }
-        return modelAmount;
+        HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+        handleDiscountDTO.setRebate(rebate);
+        handleDiscountDTO.setModelAmount(modelAmount);
+        return handleDiscountDTO;
+    }
+
+    @Data
+    public class HandleDiscountDTO {
+        BigDecimal modelAmount;
+        Integer rebate;
     }
 
     private String handleChildren(RentVehicleBO detail, Integer vehicleDayNum) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -76,9 +76,6 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
-    @Autowired
-    UserFeign userFeign;
-
     @Autowired
     ThirdFeign thirdFeign;
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -227,13 +227,13 @@
                     </foreach>
                 </trim>
                 )
-                or v.expect_destination_branch_company_id in (
+                <!--or v.expect_destination_branch_company_id in (
                 <trim suffixOverrides=",">
                     <foreach collection="companyList" item="companyId">
                         #{companyId},
                     </foreach>
                 </trim>
-                )
+                )-->
     <!--            or v.subordinate_branch in (-->
     <!--            <trim suffixOverrides=",">-->
     <!--                <foreach collection="companyList" item="companyId">-->