--no commit message

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

@@ -34,11 +34,13 @@ import com.zrqx.core.commons.form.LoginMemberInfo;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.BooleanStatusEnum;
 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;
 import com.zrqx.core.enums.order.OrderTypeEnum;
 import com.zrqx.core.enums.third.pay.PayTypeEnum;
+import com.zrqx.core.enums.third.pay.WeChartType;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -1021,6 +1023,21 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 		});
 		String trade_type = "1";	//默认扫码支付
 		/** @see com.zrqx.core/src/main/java/com/zrqx/core/enums/third/pay/WeChartType.java */
+		if(StringUtils.isNotBlank(source)){
+			if(SourceEnum.APP.getCode().equals(source)){
+				trade_type = "2";	//app
+			}
+			if(SourceEnum.XCX.getCode().equals(source)){
+				trade_type = "0";	//jsapi
+				if(StringUtils.isBlank(openId)){
+					throw new BaseException("openId不能为空");
+				}
+			}
+			if(SourceEnum.H5.getCode().equals(source)){
+				trade_type = WeChartType.H5.getCode();	//MWEB
+			}
+		}
+		/** @see com.zrqx.core/src/main/java/com/zrqx/core/enums/third/pay/WeChartType.java */
 		CallBack<PayInfoVo> result = fgPayClient.pay(orderCode, payType, trade_type, openId);
 		if (PayTypeEnum.BALANCE.getCode().equals(payType)) {
 			OrderTypeInterface orderTypeService = springContext.getEnumsBindBean(OrderTypeEnum.class, order.getOrderType(), OrderTypeInterface.class);