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

@@ -123,4 +123,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         criteria.andIn("userid", userIds);
         mapper.deleteByExample(example);
     }
+
+    @CacheClear(pre = "user{1}")
+    public void updateUserPositionByUserId(Integer userId, Integer positionId) {
+        mapper.updateUserPositionByUserId(userId,positionId);
+    }
 }

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

@@ -18,4 +18,5 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     void updateUserMemberStatusByUserId(@Param("userId") Integer userId,@Param("status") Integer status);
 
+    void updateUserPositionByUserId(@Param("userId") Integer id, @Param("positionId") Integer positionId);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserManageBiz;
 import com.github.wxiaoqi.security.admin.constant.Status;
@@ -38,6 +39,9 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
+    @Autowired
+    private AppUserDetailBiz appUserDetailBiz;
+
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
@@ -126,5 +130,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         appUserLoginBiz.deleteAppUserById(id);
         return ObjectRestResponse.succ();
     }
+
+    @PutMapping("/user_position")
+    public ObjectRestResponse<Void> setUserPositionById(@RequestParam("id") Integer id,@RequestParam("positionId") Integer positionId){
+         appUserDetailBiz.updateUserPositionByUserId(id,positionId);
+        return ObjectRestResponse.succ();
+    }
 }
 

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

@@ -125,4 +125,7 @@
 <update id="updateUserMemberStatusByUserId">
     update `app_user_detail` set `is_member`={status}  where `userid`=#{userId}
 </update>
+    <update id="updateUserPositionByUserId">
+        update  `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId}
+    </update>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -104,9 +104,9 @@
     </select>
 
     <insert id="inserBatch">
-        INSERT INTO `user_coupon`(`user_id`,`coupon_id`,`start_time`,`expire_time`,`crt_time`) VALUES
+        INSERT INTO `user_coupon`(`user_id`,`coupon_id`,`ticker_no`,`start_time`,`expire_time`,`crt_time`) VALUES
        <foreach collection="userCoupons" item="userCoupon" separator=",">
-           (#{userCoupon.userId},#{userCoupon.couponId},#{userCoupon.startTime},#{userCoupon.expireTime},#{userCoupon.crtTime} )
+           (#{userCoupon.userId},#{userCoupon.couponId},#{userCoupon.tickerNo} ,#{userCoupon.startTime},#{userCoupon.expireTime},#{userCoupon.crtTime} )
        </foreach>
     </insert>
 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/BuyVehicleFormAdminController.java

+package com.xxfc.platform.app.rest.admin;
+
+import com.xxfc.platform.app.biz.BuyVehicleFormBiz;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/9 13:55
+ */
+@RestController
+public class BuyVehicleFormAdminController {
+
+     @Autowired
+     private BuyVehicleFormBiz vehicleFormBiz;
+}

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

@@ -165,7 +165,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                return ObjectRestResponse.createFailedResult(3501, "无收车权限");
            }
        }
-
         if(baseOrder.getStatus() != -1) {
             Vehicle vehicle = null;
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
@@ -236,6 +235,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         orderVehicleCrosstownDto.setDeductionCost(amount);
        //扣除费用
         orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(amount));
+        if(orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+            return ObjectRestResponse.createFailedResult(500,"押金不足，不能交车，请联系客服！");
+        }
         //出车成功后修改订单状态
         List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
         if (oldValue.size() == 1) {
@@ -271,6 +273,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             //总押金-保留金
             totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit();
         }
+
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);