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

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

@@ -88,7 +88,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             }else {
                 //判断用户是否有有效的上线
                 log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
-                if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&relation.getBindTime()<bindTime)){
+                if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
                     relation.setParentId(parentId);
                     relation.setBindType(type);
                     relation.setBindTime(time);

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -73,4 +73,7 @@ public class CampsiteShopDetailDTO {
      */
     private String logo;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminVO.java

@@ -170,4 +170,6 @@ public class CampsiteShopAdminVO {
      */
     private List<CampsiteTagListVo>  campsiteTagListVos;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java

@@ -97,4 +97,7 @@ public class CampsiteShopDetailVo {
      * 店铺logo
      */
     private  String logo;
+
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -58,7 +58,7 @@
 
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
-        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,
+        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
         `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
     </select>
 

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

@@ -127,28 +127,6 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
             orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
         }
-//        else {
-//            //还车扣除款 剩余的 钱，再减去违章预备金
-//            BigDecimal originalRefundAmount = orderMQDTO.getOrderRentVehicleDetail().getReturnPayResidue();
-//            BigDecimal refundAmont = originalRefundAmount;
-//            String refundDesc = "退还剩余违章保证金："+ refundAmont.toString();
-//
-//            //已退还部分， 进行剩余的保留违章预备金 的退还
-//                //获取违章记录
-//            List<OrderViolation> orderViolations = orderViolationBiz.selectList(new OrderViolation(){{
-//                setDetailId(orderMQDTO.getOrderRentVehicleDetail().getId());
-//            }});
-//
-//            if(orderViolations.size() > 0) {
-//                refundDesc += "(已扣除 违章金额："+ illegalReserve.toString();
-//                for(OrderViolation ov : orderViolations) {
-//                    refundDesc += ", "+ ov.getPrice();
-//                    refundAmont = refundAmont.subtract(ov.getPrice());
-//                }
-//                refundDesc += ")";
-//                refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
-//            }
-//        }
     }
 
     public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, RefundTypeEnum refundTypeEnum) {
@@ -162,46 +140,52 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
     }
 
     /**
-     * 租车退款流程(不含押金的通用方法)
+     * 租车（包括旅游）退款流程
      * @param baseOrder
-     * @param startTime
-     * @param dicParentKey
-     */
-    public void rentRefundProcess(BaseOrder baseOrder, Long startTime, String dicParentKey){
-        rentRefundProcess(baseOrder, BigDecimal.ZERO, startTime, dicParentKey);
-    }
-
-    /**
-     * 租车（包括旅游）退款流程(含押金)
-     * @param baseOrder
-     * @param depositAmount
      * @param timeLag 与开始时间的时间差
      * @param dicParentKey
      */
-    public void rentRefundProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey) {
+    public void rentRefundProcess(BaseOrder baseOrder, Long timeLag, String dicParentKey) {
         //计算退款金额
-        // 1、押金 + 租金(规则扣除)
+            //商品价格 - 优惠券减免的价格
         BigDecimal originalRefundAmount = BigDecimal.ZERO.add(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
         StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
-        if(null == depositAmount) {
-            depositAmount = BigDecimal.ZERO;
-        }else {
-            //触发押金退款
-            refundSubProcess(baseOrder, refundDescBuilder.toString(), depositAmount, depositAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
-        }
-        //商品价格 - 优惠券减免的价格
         BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
         refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
         //退款金额
-//        BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
-//        originalRefundAmount = depositAmount.add(originalRefundAmount);
         BigDecimal refundAmount = refundGoodsAmount;
 
         //退款子流程: 订单基础，退款描述，退款金额
         refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
     }
 
+    /**
+     * 租车押金退款流程
+     * @param baseOrder
+     * @param depositAmount
+     * @param timeLag 与开始时间的时间差
+     * @param dicParentKey
+     * @param originalDeductAmount
+     */
+    public void rentRefundDepositProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey, BigDecimal originalDeductAmount) {
+        // 1、押金 + 租金(规则扣除)
+        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(depositAmount);
+        BigDecimal refundAmount = BigDecimal.ZERO.add(depositAmount);
+        StringBuilder refundDescBuilder = new StringBuilder("取消订单押金退款:");
+        if(null != originalDeductAmount && BigDecimal.ZERO.compareTo(originalDeductAmount) < 0) {
+            //通过原扣除款 计算剩余款
+            BigDecimal residueAmount = calculateRefund(originalDeductAmount, timeLag, dicParentKey, refundDescBuilder);
+            residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+
+            //退款金额 ：押金 - (原扣除款 - 剩余款)
+            refundAmount = originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount));
+        }
+
+        //触发押金退款
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
+    }
+
     public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
         BigDecimal refundGoodsAmount = goodsAmount;
 

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

@@ -8,10 +8,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.*;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
@@ -49,6 +46,9 @@ public class OrderCancelBiz {
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
 
@@ -119,18 +119,34 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
+                    //原退还押金
+                    BigDecimal freeDayAmount = BigDecimal.ZERO;
+                    //判断是否使用免费天数，并且进行扣款
+                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                            setOrderId(baseOrder.getId());
+                        }});
+                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                    }
+
+
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    if(timeLag < 0) {
-                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
-                            add("已超过出发时间，不能取消订单");
-                        }});
-                    }
+                    //后面允许开始时间过后可以取消订单
+//                    if(timeLag < 0) {
+//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
+//                            add("已超过出发时间，不能取消订单");
+//                        }});
+//                    }
 
                     //退款流程
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND);
+                        //退押金
+                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+                        //退订单款
+                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
 
                     //已付款的取消订单发送消息
                     try {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -71,74 +71,61 @@ public class RentDepositJobHandler extends IJobHandler {
     UserFeign userFeign;
 
     @Override
-    public ReturnT<String> execute(String idLastNumInterval) throws Exception {
+    public ReturnT<String> execute(String idLastNumInterval) {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
 
         try {
-//            for(int i = 0; i < 10; i++) {
-//                if(IntervalUtil.staticIsInTheInterval(String.valueOf(i), idLastNumInterval)) {
-                    //三十天
-                    List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
-                            //订单已完成的租车订单
-                            .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
-                                    .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
-                                    .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
-                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
+            List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+                //订单已完成的租车订单
+                .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
+                        .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
+                        .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
+                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
 //                                    .andLike(BaseOrder::getId, "%"+ i)
-                            ).build());
-
-                    //处理自动退剩余押金
-                    for(BaseOrder baseOrder : lists) {
-                        OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
-                            setOrderId(baseOrder.getId());
-                        }});
-
-                        Integer crosstownTypeEnum;
-                        //判断是否定损过
-                        if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
-                            crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
-                        }else {
-                            crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
-                        }
-                        OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
-                            setOrderId(baseOrder.getId());
-                            setType(crosstownTypeEnum);
-                        }});
-
-                        if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
-                            OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
-                                setDetailId(orvd.getId());
-                                setIsDel(SYS_FALSE);
-                            }});
-
-                            String refundDesc = "退还押金：";
-                            BigDecimal refundAmont;
-                            if(null != orderViolation) {
-                                //还车扣除款 剩余的 钱，再减去违章预备金
-                                refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
-                                refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
-                                refundDesc += ")";
-                            }else {
-                                refundAmont = orvd.getReturnPayResidue();
-                                refundDesc += refundAmont.toString();
-                            }
-                            orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
-                            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
-                            orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
-                        }
-
-                        //获取交车时间
-//                        List<OrderVehicleCrosstown> crosstowns = crosstownBiz.selectByExample(
-//                                new Example.Builder(BaseOrder.class)
-//                                        .where(WeekendSqls.<OrderVehicleCrosstown>custom()
-//                                                .andIn(OrderVehicleCrosstown::getType, Lists.newArrayList(CrosstownTypeEnum.ARRIVE.getCode(), CrosstownTypeEnum.FIXED_LOSS.getCode()))
-//                                                .andEqualTo(OrderVehicleCrosstown::getOrderId, baseOrder.getId())).build());
-
+                ).build());
+
+            //处理自动退剩余押金
+            for(BaseOrder baseOrder : lists) {
+                OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
+                    setOrderId(baseOrder.getId());
+                }});
+
+                Integer crosstownTypeEnum;
+                //判断是否定损过
+                if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
+                    crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+                }else {
+                    crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+                }
+                OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+                    setOrderId(baseOrder.getId());
+                    setType(crosstownTypeEnum);
+                }});
+
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
+                    OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
+                        setDetailId(orvd.getId());
+                        setIsDel(SYS_FALSE);
+                    }});
+
+                    String refundDesc = "退还押金：";
+                    BigDecimal refundAmont;
+                    if(null != orderViolation) {
+                        //还车扣除款 剩余的 钱，再减去违章预备金
+                        refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
+                        refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
+                        refundDesc += ")";
+                    }else {
+                        refundAmont = orvd.getReturnPayResidue();
+                        refundDesc += refundAmont.toString();
                     }
+                    orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                    orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
+                    orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+                }
 
-//                }
-//            }
+            }
             ReturnT returnT = new ReturnT();
             returnT.setCode(100);
             returnT.setMsg("成功");

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

@@ -8,10 +8,14 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRefund;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import lombok.Data;
@@ -23,11 +27,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
-import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_IN_REFUND;
-import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_REFUND;
+import static com.xxfc.platform.universal.constant.DictionaryKey.*;
 
 @Controller
 @RequestMapping("orderRefund")
@@ -39,6 +43,9 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -67,8 +74,29 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
             case RENT_VEHICLE:
                 orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
                         , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
                         , refundDescBuilder);
+                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
+                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
+                //原退还押金
+                BigDecimal originalDeductAmount = BigDecimal.ZERO;
+                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
+                //判断是否使用免费天数，并且进行扣款
+                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                    refundDescBuilder = new StringBuilder("");
+                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                        setOrderId(orderPageVO.getId());
+                    }});
+                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                }
+                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
+                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+
+                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
+                //退款金额 ：订单剩余款 + 押金剩余款
+                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
+
                 break;
             case TOUR:
                 //判断是省内还是省外

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/common/BehaviorEnum.java

@@ -16,7 +16,7 @@ public enum BehaviorEnum {
     /**
      * 立即前往（弹窗）
      */
-    DIALOG_WINDOW_TO(1, "立即前往(活动详情页)"),
+    DIALOG_WINDOW_TO(1, "立即前往(弹窗)"),
 
     /**
      * banner 点击
@@ -26,12 +26,12 @@ public enum BehaviorEnum {
     /**
      * 精彩活动点击
      */
-    WONDERFUL_ACTIVITY_CLICK(3, "精彩活动点击"),
+    WONDERFUL_ACTIVITY_CLICK(3, "精选活动点击"),
 
     /**
      * 注册
      */
-    REGISTRY(4, "注册"),
+    REGISTRY(4, "注册成功"),
 
     /**
      * 活动页面访问量
@@ -46,7 +46,7 @@ public enum BehaviorEnum {
     /**
      * 分享
      */
-    SHARE(7, "分享"),
+    SHARE(7, "成功分享"),
 
     /**
      * App访问
@@ -61,7 +61,12 @@ public enum BehaviorEnum {
     /**
      * 成功邀请人数大于10
      */
-    SUCCESS_MORE_10_INVIT(10,"成功邀请人数大于10");
+    SUCCESS_MORE_10_INVIT(10,"成功邀请人数大于10"),
+
+    /**
+     * 立即领取(活动详情页)
+     */
+    IMMEDIATELY_TO_RECEIVE(11,"立即领取(活动详情页)");
 
     BehaviorEnum(int code, String name) {
         this.code = code;

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/ActivityBehaviorDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:16
+ */
+@Data
+public class ActivityBehaviorDTO {
+    private Integer activityId;
+    private Integer behaviorTypeId;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/ActivityBehaviorRelationDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+public class ActivityBehaviorRelationDTO {
+
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/BehaviorTypeDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:16
+ */
+@Data
+public class BehaviorTypeDTO {
+    private String name;
+    private Integer code;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/ActivityBehavior.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:02
+ */
+@Data
+@Table(name = "activity_behavior")
+public class ActivityBehavior {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+    @Column(name = "activity_id")
+    private Integer activityId;
+    @Column(name = "behavior_type_id")
+    private Integer behaviorTypeId;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/ActivityBehaviorRelation.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+@Table(name = "activity_behavior_relation")
+public class ActivityBehaviorRelation {
+
+     @Id
+     @GeneratedValue(generator = "JDBC")
+      private Integer id;
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    @Column(name = "biz_id")
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    @Column(name = "activity_id")
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/BehaviorType.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:02
+ */
+@Data
+@Table(name = "behavior_type")
+public class BehaviorType {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "code")
+    private Integer code;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/vo/BehaviorNoteCollectVo.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class BehaviorNoteCollectVo implements Serializable {
     /**
-     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum   + 成功邀请人数 ，邀请人数>=10 ，App 访问量
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
      * 行为
      */
     private String behavior;

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/UserBeHaviorApplication.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.user.behavior;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -13,9 +14,12 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @data 2019/8/12 10:04
  */
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = "com.xxfc.platform.*.feign")
+@EnableFeignClients(basePackages = {"com.xxfc.platform.*.feign","com.github.wxiaoqi.security.*.feign"})
 @MapperScan(basePackages = "com.xxfc.platform.user.behavior.mapper")
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages ={
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.security.admin.support"
+},exclude = {MongoAutoConfiguration.class})
 public class UserBeHaviorApplication {
     public static void main(String[] args) {
         SpringApplication.run(UserBeHaviorApplication.class,args);

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/ActivityBehaviorBiz.java

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehavior;
+import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:10
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ActivityBehaviorBiz extends BaseBiz<ActivityBehaviorMapper, ActivityBehavior> {
+
+       public List<ActivityBehaviorDTO> findActivityBehaviorsByActivityId(Integer activityId){
+           return  mapper.selectbyActivityId(activityId);
+       }
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/ActivityBehaviorRelationBiz.java

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorRelationMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:12
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ActivityBehaviorRelationBiz extends BaseBiz<ActivityBehaviorRelationMapper, ActivityBehaviorRelation> {
+
+      public List<ActivityBehaviorRelationDTO> findActivityBehaviorRelationsByActivityId(Integer activityId){
+          return  mapper.selectAllByActivityId(activityId);
+      }
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/BehaviorTypeBiz.java

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
+import com.xxfc.platform.user.behavior.entity.BehaviorType;
+import com.xxfc.platform.user.behavior.mapper.BehaviorTypeMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:09
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class BehaviorTypeBiz extends BaseBiz<BehaviorTypeMapper, BehaviorType> {
+
+       public List<BehaviorTypeDTO> findBehaviorTypesByIds(List<Integer> typeIds){
+           return mapper.selectAllByIdList(typeIds);
+       }
+
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehavior;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:10
+ */
+public interface ActivityBehaviorMapper extends Mapper<ActivityBehavior> {
+    @Select("select `activity_id`,`behavior_type_id` from `activity_behavior` where `activity_id`=#{activityId}")
+    @Results(value = {
+            @Result(column = "activity_id",property = "activityId"),
+            @Result(column = "behavior_type_id",property = "behaviorTypeId")
+    })
+    List<ActivityBehaviorDTO> selectbyActivityId(@Param("activityId") Integer activityId);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorRelationMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:11
+ */
+public interface ActivityBehaviorRelationMapper extends Mapper<ActivityBehaviorRelation> {
+
+    @Select("select `type`,`biz_id`,`activity_id` from `activity_behavior_relation` where `activity_id`=#{activityId}")
+    @Results(value = {
+            @Result(property = "type",column = "type"),
+            @Result(property = "bizId",column = "biz_id"),
+            @Result(property = "activityId",column = "activity_id")
+    })
+    List<ActivityBehaviorRelationDTO> selectAllByActivityId(@Param("activityId") Integer activityId);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/BehaviorTypeMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
+import com.xxfc.platform.user.behavior.entity.BehaviorType;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:13
+ */
+public interface BehaviorTypeMapper extends Mapper<BehaviorType>, IdListMapper<BehaviorType,Integer> {
+
+    @Select("<script>select `name`,`code` from  behavior_type where `id` in <foreach collection='typeIds' open='(' item='typeId' separator=',' close=')'> #{typeId}</foreach></script>")
+    @Results(value = {
+            @Result(column = "name",property = "name"),
+            @Result(column ="code",property = "code")
+    })
+    List<BehaviorTypeDTO> selectAllByIdList(@Param("typeIds") List<Integer> typeIds);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/CustomerBehaviorNotesMapper.java

@@ -16,4 +16,8 @@ import java.util.List;
 public interface CustomerBehaviorNotesMapper extends Mapper<CustomerBehaviorNotes> {
 
     List<CustomerBehaviorNotes> selectByActivityIdAndTime(@Param("activityId") Integer activityId,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
+
+    long selectAppVvisitsByType(@Param("code") int code);
+
+    List<CustomerBehaviorNotes> selectAllByTypeIdsAndTime(@Param("bizIds") List<Integer> bizIds,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 }

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/rest/CustomerBehaviorNotesController.java

@@ -21,13 +21,13 @@ import java.util.Objects;
  * @data 2019/8/12 14:14
  */
 @RestController
-@RequestMapping("customerBehaviorNotes")
+@RequestMapping("/customerBehaviorNotes")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CustomerBehaviorNotesController {
 
     private final CustomerBehaviorNotesBiz customerBehaviorNotesBiz;
 
-    @PostMapping("app/unauth/save")
+    @PostMapping("/app/unauth/save")
     public ObjectRestResponse<Void> saveCustomerBehavior(@RequestBody CustomerBehaviorNoteDTO customerBehaviorNoteDTO, AppUserDTO appUserDTO) {
         if (Objects.nonNull(appUserDTO.getUserid())) {
             customerBehaviorNoteDTO.setCustomerId(String.valueOf(appUserDTO.getUserid()));

xx-user-behavior-collect/xx-user-behavior-server/src/main/resources/mapper/CustomerBehaviorNotesMapper.xml

@@ -26,4 +26,25 @@
             and <![CDATA[ `crt_time` <= #{endTime}]]>
         </if>
     </select>
+
+    <select id="selectAppVvisitsByType" resultType="long">
+        select count(id) from `customer_behavior_notes` where `type`=#{code}
+    </select>
+
+    <select id="selectAllByTypeIdsAndTime" resultMap="customerBehaviorNotesMap">
+        select * from  `customer_behavior_notes` where `type_id` in
+        <foreach collection="bizIds" item="bizId" open="(" close=")" separator=",">
+            #{bizId}
+        </foreach>
+        <if test="startTime != null != null and endTime !=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[`crt_time` >= #{startTime}]]>
+        </if>
+        <if test="endTime != null and startTime == null">
+            and <![CDATA[ `crt_time` <= #{endTime}]]>
+        </if>
+        and `type` in(0,1,2,3)
+    </select>
 </mapper>
\ No newline at end of file