Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class UserMemberDTO  {
 
-
+	public static final int ISBIND_BIND = 1;
 	
 	/**
      *  用户id

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

@@ -50,10 +50,10 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
         return  ObjectRestResponse.succ();
     }
     //查看是否收藏
-    public ObjectRestResponse checkUserCollect(Integer id,Integer userId){
+    public ObjectRestResponse checkUserCollect(Integer id,Integer userId,Integer type){
         Example example = new Example(AppUserCollect.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("userId",userId).andEqualTo("typeId",id).andEqualTo("isDel",0);
+        criteria.andEqualTo("userId",userId).andEqualTo("typeId",id).andEqualTo("type",type).andEqualTo("isDel",0);
        int count=selectCountByExample(example);
        boolean falg=count>0?false:true;
         return  ObjectRestResponse.succ(falg);

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

@@ -81,15 +81,18 @@ public class AppUserCollectController extends CommonBaseController {
         return collectBiz.addUserCollect(collectDTO);
     }
 
-    @RequestMapping(value = "/collect/{id}",method = RequestMethod.GET)
+    @RequestMapping(value = "/collect",method = RequestMethod.GET)
     @ApiModelProperty("查看是否收藏")
-    public ObjectRestResponse<AppUser> get(@PathVariable Integer id)throws Exception{
+    public ObjectRestResponse<AppUser> get(
+            @RequestParam(value = "id",defaultValue = "0")Integer id,
+            @RequestParam(value = "type",defaultValue = "0")Integer type
+            )throws Exception{
         String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
         if (username == null) {
             throw new Exception();
         }
         Integer userid=Integer.parseInt(username);
-        return collectBiz.checkUserCollect(userid,id);
+        return collectBiz.checkUserCollect(userid,id,type);
     }
     /**
      * 取消收藏

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

@@ -68,6 +68,11 @@ public class OrderMemberDetail implements Serializable {
     @Column(name = "rebate")
 	@ApiModelProperty(value = "折扣比例 80即 八折")
     private Integer rebate;
-	
 
+	/**
+	 *  会员等级
+	 */
+	@Column(name = "member_level")
+	@ApiModelProperty(value = "会员等级")
+	private Integer memberLevel;
 }

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

@@ -286,6 +286,12 @@ public class OrderRentVehicleDetail implements Serializable {
     @Column(name = "return_pay_residue")
 	@ApiModelProperty(value = "剩余需要退还的钱（押金）")
     private BigDecimal returnPayResidue;
-	
+
+	/**
+	 *  预定记录id
+	 */
+	@Column(name = "book_record_id")
+	@ApiModelProperty(value = "预定记录id")
+	private Long bookRecordId;
 
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/MemberBO.java

@@ -17,5 +17,4 @@ import java.util.List;
 public class MemberBO extends OrderMemberDetail implements OrderDetail {
     private BaseOrder order;
     private BaseUserMemberLevel baseUserMemberLevel;
-    private Integer levelNum;
 }

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

@@ -2,19 +2,22 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderRefund;
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,8 +38,15 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
  * @date 2019-05-15 21:30:33
  */
 @Service
+@Slf4j
 public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
+    @Autowired
+    OrderMemberDetailBiz orderMemberDetailBiz;
+
+    @Autowired
+    OrderTourDetailBiz orderTourDetailBiz;
+
     @Autowired
     OrderRentVehicleBiz orderRentVehicleBiz;
 
@@ -46,6 +56,12 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    TourFeign tourFeign;
+
+    @Autowired
+    UserFeign userFeign;
+
     public List<OrderPageVO> pageByParm(Map<String, Object> paramMap){
         return mapper.pageByParm(paramMap);
     }
@@ -60,9 +76,14 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         cancelAble = new HashMap<Integer, List<Integer>>();
         cancelAble.put(OrderTypeEnum.RentVehicle.getCode(), new LinkedList<Integer>(){{
             add(OrderStatusEnum.ORDER_UNPAY.getCode());
+            add(OrderStatusEnum.ORDER_TOSTART.getCode());
         }});
         cancelAble.put(OrderTypeEnum.TOUR.getCode(), new LinkedList<Integer>(){{
             add(OrderStatusEnum.ORDER_UNPAY.getCode());
+            add(OrderStatusEnum.ORDER_TOSTART.getCode());
+        }});
+        cancelAble.put(OrderTypeEnum.MEMBER.getCode(), new LinkedList<Integer>(){{
+            add(OrderStatusEnum.ORDER_UNPAY.getCode());
         }});
     }
 
@@ -114,8 +135,66 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
                 }
             }
+
+            //处理取消流程
+            if(OrderTypeEnum.RentVehicle.getCode().equals(baseOrder.getType())) {
+                //取消租车预定
+                
+            }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
+                OrderTourDetail otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
+                    setOrderId(baseOrder.getId());
+                }});
+
+                //增加库存
+                tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
+            }
         }else {
             throw new BaseException(ResultCode.FAILED_CODE);
         }
     }
+
+    public void payNotifyHandle(String orderNo, String tradeNo) {
+        BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
+            setNo(orderNo);
+        }});
+
+        if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus()) && baseOrder.getHasPay().equals(SYS_FALSE)) {
+            BaseOrder updateOrder = new BaseOrder() {{
+                setNo(orderNo);
+                setOutTradeNo(tradeNo);
+                setHasPay(SYS_TRUE);
+                setPayTime(System.currentTimeMillis());
+            }};
+
+            //如果是会员订单，则触发会员效益
+            if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+                //直接设置订单完成
+                updateOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                OrderMemberDetail omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail(){{
+                    setOrderId(baseOrder.getId());
+                }});
+                try {
+                    userFeign.buyMember(new UserMemberDTO() {{
+                        setUserId(baseOrder.getUserId());
+                        setDiscount(omd.getRebate());
+                        setIsBind(ISBIND_BIND);
+                        setMemberLevel(omd.getMemberLevel());
+                        setRentFreeDays(omd.getRentFreeNum());
+                    }});
+                }catch (Exception e){
+                    log.error(e.getMessage(), e);
+                }
+            }else if(OrderTypeEnum.RentVehicle.getCode().equals(baseOrder.getType())) {
+                updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
+                //车辆预定审核通过
+
+            }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
+                updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
+                //暂无处理
+            }
+            this.updateSelectiveById(updateOrder);
+        } else {
+            log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -19,8 +20,11 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO;
@@ -47,6 +51,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @Controller
@@ -64,6 +69,10 @@ public class BaseOrderController extends CommonBaseController {
     UserFeign userFeign;
     @Resource
     VehicleFeign vehicleFeign;
+
+    @Autowired
+    OrderMemberDetailBiz orderMemberDetailBiz;
+
     @Value("${gateway.host}")
     String host;
     @Value("${gateway.order}")
@@ -285,6 +294,7 @@ public class BaseOrderController extends CommonBaseController {
         }});
         if (null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
+
         }
         dbBaseOrder.setCancelReason(cancelOrderDto.getCancelReason());
         baseOrderBiz.cancel(dbBaseOrder);
@@ -299,32 +309,11 @@ public class BaseOrderController extends CommonBaseController {
     public ObjectRestResponse notifyUrl(NotifyUrlDTO dto) {
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
         if (StrUtil.isNotBlank(dto.getOrderNo())) {
-            BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
-                setNo(dto.getOrderNo());
-            }});
-
-            if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
-                baseOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                baseOrder.setOutTradeNo(dto.getTradeNo());
-                baseOrderBiz.updateById(baseOrder);
-            } else {
-                if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
-                    BaseOrder updateOrder = new BaseOrder() {{
-                        setNo(dto.getOrderNo());
-                        setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                        setOutTradeNo(dto.getTradeNo());
-                        setHasPay(SYS_TRUE);
-                        setPayTime(System.currentTimeMillis());
-                    }};
-                    baseOrderBiz.updateSelectiveById(updateOrder);
-                } else {
-                    log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
-                }
-            }
+            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo());
         }else{
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }
-        return new ObjectRestResponse().rel(true);
+        return ObjectRestResponse.succ();
     }
     /**
      * 订单查询类

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

@@ -83,7 +83,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Override
     public void initDetail(MemberBO bo) {
         super.initDetail(bo);
-        BaseUserMemberLevel buml = userFeign.level(bo.getLevelNum());
+        BaseUserMemberLevel buml = userFeign.level(bo.getMemberLevel());
         bo.setBaseUserMemberLevel(buml);
         bo.setRentFreeNum(buml.getNumber());
         bo.setRebate(buml.getDiscount());

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

@@ -15,6 +15,7 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
@@ -223,7 +224,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
-        ObjectRestResponse<String> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
-        detail.setVehicleId(orr.getData());
+        ObjectRestResponse<VehicleBookRecord> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
+        detail.setVehicleId(orr.getData().getVehicleId());
+        detail.setBookRecordId(orr.getData().getId());
     }
 }

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

@@ -120,7 +120,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         }})).getData().get(0).getId());
 
         //扣減庫存
-        tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber());
+        tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber(), TourFeign.STOCK_SUBTRACT);
 
         super.handleDetail(bo);
     }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -26,6 +26,8 @@ import java.util.Map;
  */
 @FeignClient(value = "xx-tour")
 public interface TourFeign {
+    public static final int STOCK_SUBTRACT = 1;
+    public static final int STOCK_PLUS = 2;
 
     /**
      * 计算价格
@@ -35,6 +37,13 @@ public interface TourFeign {
     @RequestMapping(value = "/spe/user/prices", method = RequestMethod.POST)
     public ObjectRestResponse<TourSpePriceVo> refund(@RequestBody TourSpePriceDTO spePriceDto);
 
+    /**
+     *
+     * @param speId
+     * @param number
+     * @param type 1--减库存，2--加库存
+     * @return
+     */
     @RequestMapping(value = "/spe/stock", method = RequestMethod.GET)
     public ObjectRestResponse<TourSpePriceVo> stock(@RequestParam Integer speId, @RequestParam Integer number, @RequestParam Integer type);
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
@@ -33,7 +34,7 @@ public interface VehicleFeign {
     public RestResponse addScore(@RequestParam(value="id")Integer  id, @RequestParam(value="score")Integer  score);
 
     @RequestMapping(value = "/vehicleInfo/rent/book/vehicle", method = RequestMethod.POST)
-    public ObjectRestResponse<String> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
+    public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
 
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
     public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -284,7 +284,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @return
      */
     @Transactional
-    public void applyVehicle4Employee(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
+    public VehicleBookRecord applyVehicle4Employee(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicle());
         //提取日期和相应的预定目标日期
@@ -337,6 +337,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             }
             bookRecordAccItemMapper.batchAdd(params);
         }
+
+        return vehicleBookRecord;
     }
 
     @Transactional

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -24,10 +24,7 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
-import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
-import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import io.swagger.annotations.Api;
@@ -379,9 +376,9 @@ public class VehicleController extends BaseController<VehicleBiz> {
         }
         bookVehicleVo.setVehicle(pageDataVO.getData().get(0).getId());
 
-        baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        VehicleBookRecord vehicleBookRecord = baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
 
-        return ObjectRestResponse.succ(bookVehicleVo.getVehicle());
+        return ObjectRestResponse.succ(vehicleBookRecord);
     }