添加会员订单

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -53,7 +53,7 @@ public interface UserFeign {
      * @return
      */
     @RequestMapping(value = "/member/app/unauth/level/{type}", method = RequestMethod.GET)
-    public List<BaseUserMemberLevel> level(@PathVariable Integer type);
+    public BaseUserMemberLevel level(@PathVariable Integer type);
 
     /**
      * 批量获取用户基本信息

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/RefundTypeEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum RefundTypeEnum {
+    RentVehicle(1, "订单款"),
+    TOUR(2, "押金"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+            //Maps.newHashMap();
+
+//    static{
+//        for(VehicleBookRecordStatus constantType : VehicleBookRecordStatus.values()){
+//            codeAndDesc.put(constantType.getCode(),constantType.getDesc());
+//        }
+//    }
+
+    RefundTypeEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-19 17:00:35
+ */
+@Data
+@Table(name = "order_member_detail")
+public class OrderMemberDetail implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  基础订单id
+     */
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "基础订单id")
+    private Integer orderId;
+	
+	    /**
+     *  名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  出租免费天数
+     */
+    @Column(name = "rent_free_num")
+	@ApiModelProperty(value = "出租免费天数")
+    private Integer rentFreeNum;
+	
+	    /**
+     *  折扣比例 80即 八折
+     */
+    @Column(name = "rebate")
+	@ApiModelProperty(value = "折扣比例 80即 八折")
+    private Integer rebate;
+	
+
+}

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

 package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,7 +40,7 @@ public class OrderRefund implements Serializable {
      */
     @Column(name = "trade_no")
 	@ApiModelProperty(value = "退款对应的流水号")
-    private Integer tradeNo;
+    private String tradeNo;
 	
 	    /**
      *  退款时间
@@ -67,7 +68,7 @@ public class OrderRefund implements Serializable {
      */
     @Column(name = "refund_amount")
 	@ApiModelProperty(value = "退款金额")
-    private Integer refundAmount;
+    private BigDecimal refundAmount;
 	
 	    /**
      *  退款说明

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,7 @@ import lombok.Data;
  * 
  * @author zjw
  * @email nishijjo@qq.com
- * @date 2019-06-15 17:11:08
+ * @date 2019-06-19 20:21:29
  */
 @Data
 @Table(name = "order_rent_vehicle_detail")
@@ -258,6 +259,13 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "优惠天数")
     private Integer freeDays;
 	
+	    /**
+     *  折扣 80 即 8折
+     */
+    @Column(name = "rebate")
+	@ApiModelProperty(value = "折扣 80 即 8折")
+    private Integer rebate;
+	
 	    /**
      *  出发公司区域id
      */
@@ -265,5 +273,19 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "出发公司区域id")
     private Integer startZoneId;
 	
+	    /**
+     *  退还钱（押金）的状态 0--未退还；1--已退还所有钱；2--已退还部分押金（保留违章预备金）；3--已退还所有押金（扣除该扣除的）
+     */
+    @Column(name = "return_pay_status")
+	@ApiModelProperty(value = "退还钱（押金）的状态 0--未退还；1--已退还所有钱；2--已退还部分押金（保留违章预备金）；3--已退还所有押金（扣除该扣除的）")
+    private Integer returnPayStatus;
+	
+	    /**
+     *  剩余需要退还的钱（押金）
+     */
+    @Column(name = "return_pay_residue")
+	@ApiModelProperty(value = "剩余需要退还的钱（押金）")
+    private BigDecimal returnPayResidue;
+	
 
 }

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

@@ -60,4 +60,8 @@ public class AddTourDTO {
     //联系邮箱
     @ApiModelProperty(value = "联系邮箱")
     private String contactEmail;
+
+    //站点id
+    @ApiModelProperty(value = "站点id")
+    private Integer siteId;
 }

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

+package com.xxfc.platform.order.pojo.order;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.order.entity.inter.OrderDetail;
+import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.entity.TourUser;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MemberBO extends OrderMemberDetail implements OrderDetail {
+    private BaseOrder order;
+    private BaseUserMemberLevel baseUserMemberLevel;
+    private Integer levelNum;
+}

xx-order/xx-order-server/pom.xml

@@ -25,6 +25,14 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- xxl-job-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 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;
@@ -21,6 +24,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 /**
@@ -81,15 +85,30 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     //计算退款金额
                         // 1、押金 + 租金(规则扣除)
                         BigDecimal refundAmont = orvd.getDeposit().add(baseOrder.getGoodsAmount());
-                        thirdFeign.refund(new OrderRefundVo(){{
+                        String refundTradeNo = thirdFeign.refund(new OrderRefundVo(){{
                             setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
                             setRefundAmount(refundAmont.multiply(new BigDecimal("100")).intValue());
                             setOrderNo(baseOrder.getNo());
                             setRefundDesc("取消订单退款:"+ refundAmont.toString());
-                        }});
+                        }}).getData();
 
-                        //创建订单退款记录
+                        //如果返回的流水为空，则当做失败
+                        Integer refundStatus = SYS_TRUE;
+                        if(StrUtil.isBlank(refundTradeNo)) {
+                            refundStatus = SYS_FALSE;
+                        }
 
+                        //创建订单退款记录
+                        OrderRefund orderRefund = new OrderRefund(){{
+                            setOrderId(baseOrder.getId());
+                            setRefundAmount(refundAmont);
+                            setRefundTime(System.currentTimeMillis());
+                            setRefundDesc("取消订单退款:"+ refundAmont.toString());
+                            setTradeNo(refundTradeNo);
+                            setRefundType(RefundTypeEnum.RentVehicle.getCode());
+                        }};
+                        orderRefund.setRefundStatus(refundStatus);
+                        orderRefundBiz.insertSelective(orderRefund);
 
                 }else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
 

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

+package com.xxfc.platform.order.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import com.xxfc.platform.order.mapper.OrderMemberDetailMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-19 17:00:35
+ */
+@Service
+public class OrderMemberDetailBiz extends BaseBiz<OrderMemberDetailMapper,OrderMemberDetail> {
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/XxlJobConfig.java

+package com.xxfc.platform.order.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Slf4j
+//@Configuration
+public class XxlJobConfig {
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appName;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        log.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppName(appName);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.jobhandler;
+
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+
+/**
+ * 跨平台Http任务
+ *
+ * @author xuxueli 2018-09-16 03:48:34
+ */
+//@JobHandler(value = "httpJobHandler")
+//@Component
+public class HttpJobHandler extends IJobHandler {
+
+    @Override
+    public ReturnT<String> execute(String param) throws Exception {
+        try {
+            XxlJobLogger.log("helloword");
+            return SUCCESS;
+        } catch (Exception e) {
+            XxlJobLogger.log(e);
+            return FAIL;
+        } finally {
+            ;
+        }
+
+    }
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderMemberDetailMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-19 17:00:35
+ */
+public interface OrderMemberDetailMapper extends Mapper<OrderMemberDetail> {
+	
+}

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

+package com.xxfc.platform.order.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("orderMemberDetail")
+public class OrderMemberDetailController extends BaseController<OrderMemberDetailBiz,OrderMemberDetail> {
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+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.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.biz.OrderCostDetailBiz;
+import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
+import com.xxfc.platform.order.biz.OrderTemplateBiz;
+import com.xxfc.platform.order.biz.OrderTourDetailBiz;
+import com.xxfc.platform.order.contant.enumerate.OrderCostEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderTemplate;
+import com.xxfc.platform.order.pojo.order.MemberBO;
+import com.xxfc.platform.order.pojo.order.TourBO;
+import com.xxfc.platform.order.pojo.price.OrderPriceVO;
+import com.xxfc.platform.order.pojo.price.TourPriceVO;
+import com.xxfc.platform.tour.dto.TourSpePriceDTO;
+import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.entity.TourGoodVerification;
+import com.xxfc.platform.tour.entity.TourUser;
+import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.tour.vo.TourSpePriceVo;
+import com.xxfc.platform.vehicle.entity.SysRegion;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import lombok.extern.log4j.Log4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Log4j
+public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz, MemberBO> {
+
+    @Autowired
+    TourFeign tourFeign;
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+
+    private static Integer IS_CHILD = 1;
+    private static Integer LEVEL_DEFAULT = 0;
+    private static Integer NUMBER_ZERO = 0;
+
+    @Autowired
+    OrderCostDetailBiz orderCostDetailBiz;
+
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
+    @Autowired
+    protected UserAuthConfig userAuthConfig;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    public HttpServletRequest request;
+
+    @PostConstruct
+    public void init(){
+        this.orderTypeEnum = OrderTypeEnum.MEMBER;
+    }
+
+    public AppUserDTO getUserInfo(){
+        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+    }
+
+    @Override
+    public void initDetail(MemberBO bo) {
+        super.initDetail(bo);
+        BaseUserMemberLevel buml = userFeign.level(bo.getLevelNum());
+        bo.setBaseUserMemberLevel(buml);
+        bo.setRentFreeNum(buml.getNumber());
+        bo.setRebate(buml.getDiscount());
+    }
+
+    @Override
+    public void handleDetail(MemberBO bo) {
+        //设置订单状态为3
+        bo.getOrder().setStatus(OrderStatusEnum.ORDER_UNPAY.getCode());
+        //设置订单图片
+        bo.getOrder().setPicture(bo.getBaseUserMemberLevel().getIcon());
+        //设置订单名称
+        bo.getOrder().setName(bo.getBaseUserMemberLevel().getName());
+
+        super.handleDetail(bo);
+    }
+
+    @Override
+    public void handleCalculate(MemberBO bo) {
+        OrderPriceVO tpv = calculatePrice(bo);
+        BeanUtil.copyProperties(tpv, bo.getOrder());
+        BeanUtil.copyProperties(tpv, bo);
+    }
+
+    @Override
+    public OrderPriceVO calculatePrice(MemberBO detail) {
+        BigDecimal orderAmount = BigDecimal.ZERO;
+        BigDecimal goodsAmount = BigDecimal.ZERO;
+        BigDecimal realAmount = BigDecimal.ZERO;
+
+            //商品价格
+        goodsAmount = goodsAmount.add(detail.getBaseUserMemberLevel().getPrice());
+            //订单总价格
+        orderAmount = orderAmount.add(goodsAmount);
+            //真实价格
+        realAmount = realAmount.add(orderAmount);
+
+            //生成订单明细
+        OrderPriceVO opv = new OrderPriceVO();
+        opv.setOrderAmount(orderAmount);
+        opv.setGoodsAmount(goodsAmount);
+        opv.setRealAmount(realAmount);
+
+        return opv;
+    }
+}

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

@@ -113,11 +113,11 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         bo.setStartCityName(sysRegion.getName());
 
         //设置verificationId 核销id
-//        bo.setVerificationId(tourFeign.entityList(BeanUtil.beanToMap(new TourGoodVerification(){{
-//            setSpeId(bo.getSpePriceId());
-//            setGoodId(bo.getGoodId());
-//            setSiteId(bo.getSiteId());
-//        }})).getData().get(0).getId());
+        bo.setVerificationId(tourFeign.entityList(BeanUtil.beanToMap(new TourGoodVerification(){{
+            setSpeId(bo.getSpePriceId());
+            setGoodId(bo.getGoodId());
+            setSiteId(bo.getSiteId());
+        }})).getData().get(0).getId());
 
         //扣減庫存
         tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber());

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

 package com.xxfc.platform.universal.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.entity.OrderRefund;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
@@ -27,6 +28,6 @@ public interface ThirdFeign {
     @RequestMapping(value = "/pay/app/wx", method = RequestMethod.POST)
     public JSONObject wx(@RequestBody OrderPayVo orderPayVo);
     @RequestMapping(value = "/refund/app/wx", method = RequestMethod.POST)
-    public JSONObject refund(@RequestBody OrderRefundVo orderRefundVo);
+    public ObjectRestResponse<String> refund(@RequestBody OrderRefundVo orderRefundVo);
 
 }