--no commit message

com.zrqx.order/src/main/java/com/zrqx/order/fg/client/pay/FgPayClient.java

@@ -17,13 +17,14 @@ public interface FgPayClient {
 	 * 	支付(获取支付页面或二维码url)
 	 * @param orderCode	订单编号
 	 * @param payType	支付类型
+	 * @param trade_type	支付方式
 	 * @return
 	 * @author lw
 	 * @date: 2019年2月20日 下午5:29:08
 	 */
 	@GetMapping(PayRequestPath.FG + PayRequestPath.PAY + PayRequestPath.PAY)
 	public CallBack<PayInfoVo> pay(@RequestParam("orderCode") String orderCode,
-			@RequestParam("payType") String payType);
+			@RequestParam("payType") String payType,@RequestParam("trade_type") String trade_type);
 	
 	/**
 	 * 支付查询

com.zrqx.order/src/main/java/com/zrqx/order/fg/client/pay/FgPayClientHystrix.java

@@ -21,7 +21,7 @@ public class FgPayClientHystrix implements FgPayClient {
 	}
 
 	@Override
-	public CallBack<PayInfoVo> pay(String orderCode, String payType) {
+	public CallBack<PayInfoVo> pay(String orderCode, String payType, String trade_type) {
 		logger.info("FgPayClientHystrix#getPayUrl调用聚合支付服务获取支付url失败");
 		return CallBack.fail();
 	}

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

@@ -83,7 +83,7 @@ public class FgOrderController {
 		}
 		Integer orderId = fgOrderService.createOrder(form.getPrice());
 		Order order = fgOrderService.selectByPrimaryKey(orderId);
-		return CallBack.success(fgOrderService.pay(order.getCode(), form.getPayType()));
+		return CallBack.success(fgOrderService.pay(order.getCode(), form.getPayType(), form.getSource()));
 	}
 	
 	@ApiOperation("生成开通vip订单,并支付")
@@ -94,7 +94,7 @@ public class FgOrderController {
 		}*/
 		Integer orderId = fgOrderService.createOrder(form);
 		Order order = fgOrderService.selectByPrimaryKey(orderId);
-		PayInfoVo info = fgOrderService.pay(order.getCode(), form.getPayType());
+		PayInfoVo info = fgOrderService.pay(order.getCode(), form.getPayType(), form.getSource());
 		return CallBack.success(info);
 	}
 	
@@ -127,7 +127,7 @@ public class FgOrderController {
 	@GetMapping(OrderRequestPath.PAY)
 	public CallBack<PayInfoVo> pay(@NotNull @ApiParam("订单code") @RequestParam("orderCode")String orderCode,
 			@NotNull @ApiParam("支付类型") @RequestParam("payType")String payType){
-		return CallBack.success(fgOrderService.pay(orderCode, payType));	
+		return CallBack.success(fgOrderService.pay(orderCode, payType, null));	
 	}
 	
 	@ApiOperation("获取近n个月的m条最新订单,按照创建时间倒序")

com.zrqx.order/src/main/java/com/zrqx/order/fg/service/FgInvoiceServiceImpl.java

@@ -68,7 +68,7 @@ public class FgInvoiceServiceImpl extends BaseServiceImpl<Invoice, Integer> impl
 	@Override
 	public FgInvoiceVo saveAndOpen(Integer id) {
 		Order o = fgOrderManage.notNull(id);
-		if(StringUtils.isEmpty(o.getInvoiceEmail()) && StringUtils.isEmpty(o.getPhone())){
+		if(StringUtils.isEmpty(o.getInvoiceEmail()) && StringUtils.isEmpty(o.getInvoiceTel())){
 			throw new BusinessValidateException("订单的邮箱和手机号不能同时为空");
 		}
 		BaiwangForm form = this.createBaiwangForm(o);

com.zrqx.order/src/main/java/com/zrqx/order/fg/service/FgOrderService.java

@@ -77,11 +77,12 @@ public interface FgOrderService extends BaseService<Order, Integer>{
 	 * 统一调用三方----去支付（获取页面或二维码url）
 	 * @param code		订单id
 	 * @param payType	支付类型
+	 * @param source	来源(0 pc,1 wap,2 app)
 	 * @return
 	 * @author lw
 	 * @date: 2019年1月21日 下午5:17:16
 	 */
-	PayInfoVo pay(String orderId, String payType);
+	PayInfoVo pay(String orderId, String payType, String source);
 
 	/**
 	 * 获取订单支付验证信息

com.zrqx.order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSON;
 import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.GoodsTypeEnum;
 import com.zrqx.core.enums.GoodsTypeStartEnum;
+import com.zrqx.core.enums.SourceEnum;
 import com.zrqx.core.enums.order.InvoiceContextEnum;
 import com.zrqx.core.enums.order.OrderInvoiceStatusEnum;
 import com.zrqx.core.enums.order.OrderStatusEnum;
@@ -472,17 +473,24 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 	 * @see com.zrqx.order.fg.service.FgOrderService#getPayUrl(java.lang.String, java.lang.String)
 	 * @param code		订单code
 	 * @param payType	支付类型
+	 * @param payType	支付类型
 	 * @return
 	 * @author lw
 	 * @date: 2019年1月21日 下午5:18:37
 	 */
 	@Override
-	public PayInfoVo pay(String orderCode, String payType) {
+	public PayInfoVo pay(String orderCode, String payType, String source) {
 		Order order = notNull(record -> {
 			record.setCode(orderCode);
 			fgRedisManage.getMember().getId();
 		});
-		CallBack<PayInfoVo> result = fgPayClient.pay(orderCode, payType);
+		String trade_type = "1";	//默认扫码支付
+		if(StringUtils.isNotBlank(source)){
+			if(SourceEnum.APP.getCode().equals(source)){
+				trade_type = "2";
+			}
+		}
+		CallBack<PayInfoVo> result = fgPayClient.pay(orderCode, payType, trade_type);
 		if (PayTypeEnum.BALANCE.getCode().equals(payType)) {
 			OrderTypeInterface orderTypeService = springContext.getEnumsBindBean(OrderTypeEnum.class, order.getOrderType(), OrderTypeInterface.class);
 			if (result.hasEntity() && result.getData().getIsPay()) {