--no commit message

app/order/src/main/java/com/zrqx/order/commons/form/fg/WapOrderForm.java

@@ -11,5 +11,8 @@ public class WapOrderForm extends FgOrderForm{
 	
 	@ApiModelProperty("订单号")
 	private String code;
+	
+	@ApiModelProperty("trade_type=JSAPI时（即公众号支付），此参数必传，此参数为微信用户在商户对应appid下的唯一标识")
+	private String openid;
 
 }

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

@@ -100,7 +100,7 @@ public class FgOrderController {
 	public CallBack<PayInfoVo> createOrderAndPay(@RequestBody WapOrderForm form){
 		Integer orderId = fgOrderService.createOrder(form);
 		Order o = fgOrderService.notNull(orderId);
-		return CallBack.success(fgOrderService.payWap(o, form.getSource(), form.getPayType()));
+		return CallBack.success(fgOrderService.payWap(o, form.getSource(), form.getPayType(), form.getOpenid()));
 	}
 	
 	

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

@@ -57,7 +57,7 @@ public interface FgOrderService extends BaseService<Order, Integer>{
 	  * @author lpf
 	  * @date 2020-04-09 10:49
 	  */
-	PayInfoVo payWap(Order order, String source, String payType);
+	PayInfoVo payWap(Order order, String source, String payType, String openid);
 	
 	/**
 	 * 接收三方调用----拿到支付回调修改订单状态

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

@@ -203,8 +203,8 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 	}
 	
 	@Override
-	public PayInfoVo payWap(Order order, String source, String payType) {
-		CallBack<PayInfoVo> result = fgPayClient.pay(order.getCode(), source, payType);
+	public PayInfoVo payWap(Order order, String source, String payType, String openid) {
+		CallBack<PayInfoVo> result = fgPayClient.pay(order.getCode(), source, payType, openid);
 		if (PayTypeEnum.BALANCE.getCode().equals(payType)) {
 			OrderTypeInterface orderTypeService = springContext.getEnumsBindBean(OrderTypeEnum.class, order.getOrderType(), OrderTypeInterface.class);
 			if (result.hasEntity() && result.getData().getIsPay()) {

app/pay/src/main/java/com/zrqx/pay/fg/controller/FgPayController.java

@@ -35,8 +35,8 @@ public class FgPayController {
 	
 	@ApiOperation("支付（根据不同的来源和支付类型发起支付）")
 	@GetMapping("/pay-wap")
-	public CallBack<PayInfoVo> pay(String orderCode, String source, String payType) {
-		return CallBack.success(fgPayService.pay(orderCode, source, payType));
+	public CallBack<PayInfoVo> pay(String orderCode, String source, String payType,String openid) {
+		return CallBack.success(fgPayService.pay(orderCode, source, payType,openid));
 	}
 	
 	@ApiOperation("接收三方调用----获取订单详情")

app/pay/src/main/java/com/zrqx/pay/fg/service/FgPayService.java

@@ -26,7 +26,7 @@ public interface FgPayService  {
 	  * @author lpf
 	  * @date 2020-04-09 11:27
 	  */
-	PayInfoVo pay(String orderCode, String source, String payType);
+	PayInfoVo pay(String orderCode, String source, String payType, String openid);
 
 	/**
 	 * 调用订单----获取订单详情

app/pay/src/main/java/com/zrqx/pay/fg/service/FgPayServiceImpl.java

@@ -113,7 +113,7 @@ public class FgPayServiceImpl implements FgPayService {
 	
 	
 	@Override
-	public PayInfoVo pay(String orderCode, String source, String payType) {
+	public PayInfoVo pay(String orderCode, String source, String payType,String openid) {
 		if(fgPayRecordManage.checkOrderIsConsume(orderCode)) {
 			log.error("订单：" + orderCode + "已经被支付");
 			return new PayInfoVo(false, null, "该订单已经被支付");
@@ -143,6 +143,7 @@ public class FgPayServiceImpl implements FgPayService {
 		ToPayForm toPayForm = new ToPayForm();
 		toPayForm.setOut_trade_no(orderCode);
 		toPayForm.setPayType(payType);
+		toPayForm.setOpenid(openid);
 		// if(PayTypeEnum.WECHAT.getCode().equals(payType)){
 		if (SourceEnum.PC.getCode().equals(source)) {
 			toPayForm.setTrade_type(WeChartType.NATIVE.getCode());