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/BaseUserMemberExportBiz.java

@@ -42,7 +42,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
 
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
-    public void importUserMember(List<String[]> userMemberData){
+    public int importUserMember(List<String[]> userMemberData){
         List<BaseUserMemberExport> baseUserMemberExports = new ArrayList<>();
 
         List<Integer> levels = userMemberData.stream().map(x -> x[1]).map(Integer::valueOf).collect(Collectors.toList());
@@ -90,6 +90,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
         }
 
         InsertBatch(baseUserMemberExports);
+        return baseUserMemberExports.size();
     }
 
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)

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

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.github.wxiaoqi.security.admin.AdminBootstrap;
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.common.RestResponse;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -73,7 +78,29 @@ public class UserMemberController {
             }
         }
         userMemberData.remove(0);
-        baseUserMemberExportBiz.importUserMember(userMemberData);
-        return  ObjectRestResponse.succ();
+        try {
+            int effectSize = baseUserMemberExportBiz.importUserMember(userMemberData);
+            return  ObjectRestResponse.succ(effectSize);
+        }catch (BaseException ex){
+         return  ObjectRestResponse.createDefaultFail();
+        }
+    }
+
+    @GetMapping("/user/excel_model/dowload")
+    public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){
+        // 重置response
+        response.reset();
+        //设置http头信息的内容
+        response.setCharacterEncoding("utf-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.addHeader("Content-Disposition", "attachment;filename=usermember.xlsx");
+        InputStream inputStream = AdminBootstrap.class.getClassLoader().getResourceAsStream("file/usermember.xlsx");
+        try {
+            byte[] bytes = IOUtils.toByteArray(inputStream);
+            return ResponseEntity.ok(bytes);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
     }
 }

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.3:3306/xxfc_activity?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_app?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
 
 #\u5305\u540D
-package=com.xxfc.platform.activity
+package=com.xxfc.platform.app
 #\u4F5C\u8005
-author=libin
+author=zjw
 #Email
 email=18178966185@163.com
 #\u8868\u524D\u9519\u8BEF\u7684Unicode\u5B57\u7B26\u4E32!

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/BuyVehicleForm.java

+package com.xxfc.platform.app.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 购房车提交表单
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+@Data
+@Table(name = "buy_vehicle_form")
+public class BuyVehicleForm implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  车型id
+     */
+    @Column(name = "model_id")
+	@ApiModelProperty(value = "车型id")
+    private Integer modelId;
+	
+	    /**
+     *  联系人名称
+     */
+    @Column(name = "contact_name")
+	@ApiModelProperty(value = "联系人名称")
+    private String contactName;
+	
+	    /**
+     *  联系人电话
+     */
+    @Column(name = "contact_phone")
+	@ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+	
+	    /**
+     *  预约时间
+     */
+    @Column(name = "book_time")
+	@ApiModelProperty(value = "预约时间")
+    private Long bookTime;
+	
+	    /**
+     *  公司id
+     */
+    @Column(name = "company_id")
+	@ApiModelProperty(value = "公司id")
+    private Integer companyId;
+	
+	    /**
+     *  备注
+     */
+    @Column(name = "remark")
+	@ApiModelProperty(value = "备注")
+    private String remark;
+	
+
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java

+package com.xxfc.platform.app.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import com.xxfc.platform.app.mapper.BuyVehicleFormMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 购房车提交表单
+ *
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+@Service
+public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper,BuyVehicleForm> {
+}
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BuyVehicleFormMapper.java

+package com.xxfc.platform.app.mapper;
+
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 购房车提交表单
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+public interface BuyVehicleFormMapper extends Mapper<BuyVehicleForm> {
+	
+}

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

+package com.xxfc.platform.app.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.app.biz.BuyVehicleFormBiz;
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("buyVehicleForm")
+
+public class BuyVehicleFormController extends BaseController<BuyVehicleFormBiz,BuyVehicleForm> {
+
+}
\ No newline at end of file

xx-app/xx-app-server/src/main/resources/mapper/BuyVehicleFormMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.app.mapper.BuyVehicleFormMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.app.entity.BuyVehicleForm" id="buyVehicleFormMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="modelId" column="model_id"/>
+        <result property="contactName" column="contact_name"/>
+        <result property="contactPhone" column="contact_phone"/>
+        <result property="bookTime" column="book_time"/>
+        <result property="companyId" column="company_id"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

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

@@ -15,4 +15,13 @@ public class OrderAboutParamDTO {
 
     @ApiModelProperty(value = "旅游订单自动取消时间(毫秒)")
     private Long actTour;
+
+    @ApiModelProperty(value = "会员订单自动取消时间(毫秒)")
+    private Long actMember;
+
+    @ApiModelProperty(value = "平台司机单价")
+    private BigDecimal driverPrice;
+
+    @ApiModelProperty(value = "免赔费用")
+    private BigDecimal damageSafe;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -46,7 +46,7 @@ public class RabbitConsumer {
             baseOrderBiz.cancel(baseOrder);
         }catch (BaseException e) {
             if(ResultCode.DB_OPERATION_FAIL_CODE == e.getStatus()) {
-                log.info("取消操作被取消");
+                log.info("取消操作被取消;订单id："+ baseOrder.getId());
             }
         }catch (Exception e) {
             log.error("============消费失败,尝试消息补发再次消费!==============");

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

@@ -113,6 +113,9 @@ public class BaseOrderController extends CommonBaseController {
             setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.INSURE_PRICE).getDetail()));
             setActRent(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_RENT).getDetail()));
             setActTour(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_TOUR).getDetail()));
+            setActMember(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_MEMBER).getDetail()));
+            setDamageSafe(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail()));
+            setDriverPrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DRIVER_PRICE).getDetail()));
         }});
     }
 
@@ -236,6 +239,7 @@ public class BaseOrderController extends CommonBaseController {
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> get(@PathVariable String no) {
+        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
         //查询列表数据
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
@@ -246,6 +250,7 @@ public class BaseOrderController extends CommonBaseController {
         if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
+        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 

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

@@ -15,6 +15,8 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.pojo.order.MemberBO;
 import com.xxfc.platform.order.pojo.price.OrderPriceVO;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,8 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
 @Service
 @Log4j
 public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz, MemberBO> {
@@ -36,10 +40,14 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Autowired
     VehicleFeign vehicleFeign;
 
+    @Autowired
+    ThirdFeign thirdFeign;
+
 
     private static Integer IS_CHILD = 1;
     private static Integer LEVEL_DEFAULT = 0;
     private static Integer NUMBER_ZERO = 0;
+    private static Long autoCancelTime;
 
     @Autowired
     OrderCostDetailBiz orderCostDetailBiz;
@@ -68,6 +76,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Override
     public void initDetail(MemberBO bo) {
         super.initDetail(bo);
+        initDictionary();
         BaseUserMemberLevel buml = userFeign.level(bo.getMemberLevel());
         if(!bo.getMemberLevelId().equals(buml.getId())) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashSet<String>(){{
@@ -79,6 +88,11 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         bo.setRebate(buml.getDiscount());
     }
 
+    public void initDictionary() {
+        dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        this.autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_MEMBER).getDetail());
+    }
+
     @Override
     public void handleDetail(MemberBO bo) {
         //设置订单状态为3
@@ -91,7 +105,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         super.handleDetail(bo);
 
         //发送定时取消订单(30分钟)
-        rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
     }
 
     @Override

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

@@ -197,7 +197,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             //总价格
         orderAmount = orderAmount.add(goodsAmount).add(insureAmount);
             //真实价格
-        realAmount = realAmount.add(tourSpePriceVo.getRealPrice()).add(tourSpePriceVo.getRealChildPrice());
+        realAmount = realAmount.add(tourSpePriceVo.getRealPrice()).add(tourSpePriceVo.getRealChildPrice()).add(insureAmount);
 
             //生成订单明细
         TourPriceVO tpv = BeanUtil.toBean(tourSpePriceVo, TourPriceVO.class);

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -35,6 +35,7 @@ public class DictionaryKey {
      */
     public static final String ACT_RENT = "ACT_RENT";
     public static final String ACT_TOUR = "ACT_TOUR";
+    public static final String ACT_MEMBER = "ACT_MEMBER";
 
     /**
      * 支付价格减低