优惠卷

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

@@ -33,7 +33,7 @@ public interface ActivityFeign {
             @RequestParam(value = "TickerNo") String TickerNo,
             @RequestParam(value = "orderNo") String orderNo,
             @RequestParam(value = "channel") Integer channel,
-            @RequestParam(value = "orderNo") BigDecimal amout);
+            @RequestParam(value = "amout") BigDecimal amout);
 
     @ApiOperation("优惠卷取消使用")
     @RequestMapping(value = "/user/cancelUse", method = RequestMethod.POST)

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -52,7 +52,7 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
             @RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo,
             @RequestParam(value = "orderNo",defaultValue ="" ) String orderNo,
             @RequestParam(value = "channel",defaultValue ="1" ) Integer channel,
-            @RequestParam(value = "orderNo",defaultValue ="0.00" ) BigDecimal amout
+            @RequestParam(value = "amout",defaultValue ="0.00" ) BigDecimal amout
     ) {
         return   baseBiz.useTickerNo(userId,TickerNo,orderNo,channel,amout);
     }

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.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
@@ -71,6 +72,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     @PostConstruct
     public void init(){
         this.orderTypeEnum = OrderTypeEnum.RENT_VEHICLE;
@@ -212,6 +216,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //优惠券处理
             //待完成
+       // activityFeign.use(dto.getUserid(),);
 
         //如果有使用会员权益或者优惠券，则设置订单已优惠
         if(SYS_TRUE.equals(detail.getOrder().getHasMemberRight())) {

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

@@ -193,6 +193,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             //人数 * 天数 * 价格
             insureAmount = insureAmount.add(INSURE_PRICE.multiply(new BigDecimal(String.valueOf(detail.getTotalNumber() * detail.getTourGood().getNumber()))));
         }
+
+        //优惠券处理
+        //待完成
+
             //总价
         tourAmount = tourAmount.add(tourSpePriceVo.getTotalPrice()).add(tourSpePriceVo.getTotalChildPrice());
             //商品价格