--no commit message

com.zrqx.order/src/main/java/com/zrqx/order/fg/controller/FgOrderController.java

@@ -49,7 +49,6 @@ import com.zrqx.core.vo.order.fg.FgRecentlyOrderVo;
 import com.zrqx.core.vo.order.fg.OrderPayVo;
 import com.zrqx.core.vo.pay.PayInfoVo;
 import com.zrqx.order.commons.redis.FgRedisManage;
-import com.zrqx.order.fg.client.member.FgPersonalMemberClient;
 import com.zrqx.order.fg.service.FgOrderInfoService;
 import com.zrqx.order.fg.service.FgOrderService;
 
@@ -65,8 +64,6 @@ public class FgOrderController {
 	@Autowired
 	private FgOrderInfoService fgOrderInfoService;
 	
-	@Autowired
-	private FgPersonalMemberClient fgPersonalMemberClient;
 	
 	@ApiOperation("生成订单")
 	@PostMapping(OrderRequestPath.CREATE_ORDER)
@@ -86,7 +83,7 @@ public class FgOrderController {
 		return CallBack.success(fgOrderService.pay(order.getCode(), form.getPayType(), form.getSource()));
 	}
 	
-	@ApiOperation("生成开通vip订单,并支付")
+	@ApiOperation("生成开通vip订单,并支付,不推荐")
 	@PostMapping(OrderRequestPath.CREATE_VIP_ORDER)
 	public CallBack<PayInfoVo> createOrder(FgOpenVipForm form) {
 		/*if (PayTypeEnum.BALANCE.getCode().equals(form.getPayType())) {
@@ -98,6 +95,18 @@ public class FgOrderController {
 		return CallBack.success(info);
 	}
 	
+	@ApiOperation("生成开通vip订单,并支付,推荐")
+	@PostMapping(OrderRequestPath.CREATE_VIP_ORDER+OrderRequestPath.NEW)
+	public CallBack<PayInfoVo> createVIPOrder(@RequestBody FgOpenVipForm form) {
+		/*if (PayTypeEnum.BALANCE.getCode().equals(form.getPayType())) {
+			throw new BusinessValidateException("充值订单不能使用余额支付");
+		}*/
+		Integer orderId = fgOrderService.createOrder(form);
+		Order order = fgOrderService.selectByPrimaryKey(orderId);
+		PayInfoVo info = fgOrderService.pay(order.getCode(), form.getPayType(), form.getSource());
+		return CallBack.success(info);
+	}
+	
 	@ApiOperation("支付验证接口")
 	@GetMapping(OrderRequestPath.GET + OrderRequestPath.ORDER_PAY_VO)
 	public CallBack<OrderPayVo> getOrderPayVo(@RequestParam("code") String code){

com.zrqx.order/src/main/java/com/zrqx/order/fg/service/order/impl/DefaultOrderInfoFactoryImpl.java

@@ -10,9 +10,11 @@ import com.zrqx.core.enums.GoodsTypeEnum;
 import com.zrqx.core.enums.order.OrderTypeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.order.fg.CreateOrderInfoForm;
+import com.zrqx.core.model.member.Vip;
 import com.zrqx.core.model.order.OrderInfo;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.order.fg.client.FgGoodsClient;
+import com.zrqx.order.fg.client.member.FgPersonalMemberClient;
 import com.zrqx.order.fg.service.order.OrderInfoFactoryAdapter;
 
 /**
@@ -25,6 +27,8 @@ public class DefaultOrderInfoFactoryImpl extends OrderInfoFactoryAdapter{
 
 	@Autowired
 	private FgGoodsClient fgGoodsClient;
+	@Autowired
+	private FgPersonalMemberClient fgPersonalMemberClient;
 	
 	/**
 	 * 创建订单详情对象
@@ -82,17 +86,27 @@ public class DefaultOrderInfoFactoryImpl extends OrderInfoFactoryAdapter{
 	public OrderInfo create(BigDecimal price, String orderType, Integer id) {
 		OrderInfo info = new OrderInfo();
 		if(OrderTypeEnum.VIP.getCode().equals(orderType)){
-			info.setGoodsid(id.toString());
-			info.setType(GoodsTypeEnum.VIP.getCode());
-			info.setName(GoodsTypeEnum.VIP.getName());
-			info.setWeight(new BigDecimal(0));
-			info.setPrice(price);
-			info.setDiscount(new BigDecimal(1));
-			info.setSalePrice(price);
-			info.setTotalPrice(price);
-			info.setNum(1);
-			info.setHasComment(BooleanStatusEnum.NO.getCode());
-			//info.setCover(cover);
+			CallBack<Vip> call = fgPersonalMemberClient.getById(id);
+			if (call.hasEntity()) {
+				Vip vip = call.getData();
+				CreateOrderInfoForm form = new CreateOrderInfoForm();
+				form.setGoodsId(id+"");
+				form.setGoodsType(GoodsTypeEnum.VIP.getCode());
+				form.setNum(1);
+				form.setSalePrice(price);
+				
+				info.setGoodsid(vip.getId()+"");
+				info.setType(GoodsTypeEnum.VIP.getCode());
+				info.setName(GoodsTypeEnum.VIP.getName());
+				info.setWeight(new BigDecimal(0));
+				info.setDiscount(new BigDecimal(1));
+				info.setPrice(vip.getSellprice());
+				info.setSalePrice(vip.getSellprice());
+				
+				this.after(form, info);
+				return info;
+			}
+			throw new BaseException("生成订单详情失败");
 		}
 		return info;
 	}