修改

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Coupon.java

@@ -22,7 +22,12 @@ import java.math.BigDecimal;
 @Table(name = "coupon")
 public class Coupon implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
+	public static final Integer CHANNEL_ALL = 0;
+	public static final Integer CHANNEL_RENT = 1;
+	public static final Integer CHANNEL_TOUR = 2;
+	public static final Integer CHANNEL_CAMPSITE = 3;
+
 	    /**
     *  主键id
    */
@@ -237,6 +242,5 @@ public class Coupon implements Serializable {
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
     private Integer isDel;
-	
 
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java

@@ -18,8 +18,9 @@ import java.math.BigDecimal;
 @FeignClient(value = "xx-activity")
 public interface ActivityFeign {
 
-    public static final Integer IS_USE = 1;
-    public static final Integer NOT_USE = 0;
+    public static final Integer TYPE_USE = 1;
+    public static final Integer TYPE_NO_USE = 0;
+
 
     @ApiOperation("用户自动领取新人卷")
     @RequestMapping(value = "/user/auth/led", method = RequestMethod.POST)

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

@@ -228,4 +228,11 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "支付来源 1--app；2--小程序")
 	@Column(name = "pay_origin")
 	private Integer payOrigin;
+
+	/**
+	 * 优惠券优惠的价格
+	 */
+	@ApiModelProperty(value = "优惠券优惠的价格")
+	@Column(name = "coupon_amount")
+	private Integer couponAmount;
 }

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

@@ -22,8 +22,9 @@ public class MemberBO extends OrderMemberDetail implements OrderDetail {
      * 下单来源，1--app；2--小程序
      */
     private Integer orderOrigin;
+
     /**
      * 优惠券*
      */
-    private List<Coupon> coupons;
+    private List<String> tickerNo;
 }

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

@@ -31,5 +31,5 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     /**
      * 优惠券*
      */
-    private List<Coupon> coupons;
+    private List<String> tickerNo;
 }

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

@@ -28,5 +28,5 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
     /**
      * 优惠券*
      */
-    private List<Coupon> coupons;
+    private List<String> tickerNo;
 }

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

@@ -38,6 +38,8 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
 
     protected OrderTypeEnum orderTypeEnum;
 
+    protected Integer channel;
+
     /**
      * 创建基础订单
      * @return

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

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
@@ -77,6 +78,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     @PostConstruct
     public void init(){
+        this.channel = Coupon.CHANNEL_RENT;
         this.orderTypeEnum = OrderTypeEnum.RENT_VEHICLE;
     }
 
@@ -160,6 +162,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal driverAmount = BigDecimal.ZERO;
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
         BigDecimal modelAmount = BigDecimal.ZERO;
+        BigDecimal couponAmount = BigDecimal.ZERO;
         Integer vehicleDayNum = 0;
         Integer freeDayNum = 0;
 
@@ -214,10 +217,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }
         vehicleAmount = vehicleAmount.add(modelAmount.multiply(BigDecimal.valueOf(vehicleDayNum)));
 
-        //优惠券处理
-            //待完成
-//        activityFeign.use();
-
         //如果有使用会员权益或者优惠券，则设置订单已优惠
         if(SYS_TRUE.equals(detail.getOrder().getHasMemberRight())) {
             detail.getOrder().setHasDiscount(SYS_TRUE);
@@ -235,6 +234,13 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
             //商品价格
         goodsAmount = goodsAmount.add(vehicleAmount).add(driverAmount).add(damageSafeAmount);
+
+        //优惠券处理
+        //待完成
+        if(null != detail.getTickerNo() && detail.getTickerNo().size() > 0) {
+            couponAmount = activityFeign.use(dto.getUserid(), detail.getTickerNo().get(0), detail.getOrder().getNo(), channel, goodsAmount, ActivityFeign.TYPE_NO_USE);
+        }
+
             //总价格（包含押金）
         orderAmount = orderAmount.add(goodsAmount).add(vehicleModel.getDeposit());
 

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
@@ -82,6 +83,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
 
     @PostConstruct
     public void init(){
+        this.channel = Coupon.CHANNEL_TOUR;
         this.orderTypeEnum = OrderTypeEnum.TOUR;
     }