更新

src/main/java/com/huiju/estateagents/property/controller/WxPayController.java

 
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxUnifiedOrder(outTradeNo, type, getPersonId(request));
+			resp = wxPayService.wxUnifiedOrder(outTradeNo, type, getPersonId(request), request.getRemoteAddr());
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/property/service/WxPayServiceI.java

 	 * @param type 订单类型  car 车缴费 , bill 物业缴费
 	 * @param personId
 	 */
-	Map<String, String> wxUnifiedOrder(String outTradeNo, String type, String personId) throws Exception;
+	Map<String, String> wxUnifiedOrder(String outTradeNo, String type, String personId, String clientId) throws Exception;
 	
 	/**
 	 * 支付成功的回调 物业缴费

src/main/java/com/huiju/estateagents/property/service/impl/WxPayServiceImpl.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.wxpay.WXPay;
 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WXPayUtil;
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Map<String, String> wxUnifiedOrder(String orderNo, String type, String personId) throws Exception {
+	public Map<String, String> wxUnifiedOrder(String orderNo, String type, String personId, String clientIp) throws Exception {
 		//构建微信配置
 		WxConfig config = getWxConfig(1);
 		WXPay wxpay = new WXPay(config);
 
+		TaPerson person = taPersonMapper.selectById(personId);
 
 		Map<String, Object> orderPriceAndNotifyUrl = getOrderPriceAndNotifyUrl(type, orderNo, "wx");
 
 		data.put("device_info", "");
 		data.put("fee_type", "CNY");
 		//金额 后台计算
-		data.put("total_fee", String.valueOf(orderPriceAndNotifyUrl.get("payPrice")));
+		data.put("total_fee",String.valueOf(orderPriceAndNotifyUrl.get("payPrice")));
 		//终端IP
-		data.put("spbill_create_ip", "123.12.12.123");
+		data.put("spbill_create_ip", clientIp);
 		//回调地址
 		data.put("notify_url", String.valueOf(orderPriceAndNotifyUrl.get("notifyUrl")));
 		// 此处指定为APP支付
-		data.put("trade_type", "APP");
+		data.put("trade_type", "JSAPI");
+		//openid
+		data.put("openid", person.getMiniOpenid());
 		Map<String, String> resp = wxpay.unifiedOrder(data);
 		log.info("下单成功：{}", resp);
 		if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
 			throw new Exception(resp.get("err_code_des"));
 		}
 		//插入下单记录表
-		
+
 		//第二次重新生成签名
 		Map<String, String> secondSignData = new HashMap<String, String>();
 		long timestamp = Instant.now().getEpochSecond();
-		secondSignData.put("appid", config.getAppID());
-		secondSignData.put("partnerid", config.getMchID());
-		secondSignData.put("prepayid", resp.get("prepay_id"));
-		secondSignData.put("noncestr", resp.get("nonce_str"));
-		secondSignData.put("timestamp", String.valueOf(timestamp));
-		secondSignData.put("package", "Sign=WXPay");
+		secondSignData.put("appId", config.getAppID());
+		secondSignData.put("nonceStr", resp.get("nonce_str"));
+		secondSignData.put("timeStamp", String.valueOf(timestamp));
+		secondSignData.put("package", "prepay_id="+resp.get("prepay_id"));
+		secondSignData.put("signType", WXPayConstants.SignType.MD5.toString());
 		secondSignData.put("sign", WXPayUtil.generateSignature(secondSignData, config.getKey(), WXPayConstants.SignType.MD5));
 
 		log.info("订单: {}，订单类型: {}, 状态变更为正在支付", orderNo, type);

src/main/resources/application-dev.yml

 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: http://106.14.20.193:8086/api/wxBillNotify
-  ali-bill-notify: http://106.14.20.193:8086/api/aliPayBillNotify
-  wx-car-notify: http://106.14.20.193:8086/api/wxCarNotify
-  ali-car-notify: http://106.14.20.193:8086/api/aliPayCarNotify
-  wx-tmp-notify: http://106.14.20.193:8086/api/wxTmpNotify
-  ali-tmp-notify: http://106.14.20.193:8086/api/aliTmpNotify
+  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  ali-bill-notify:
+  wx-car-notify:
+  ali-car-notify:
+  wx-tmp-notify:
+  ali-tmp-notify:
 
 #法大大服务器地址
 fadada:

src/main/resources/application-prod.yml

 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: http://106.14.20.193:8086/api/wxBillNotify
-  ali-bill-notify: http://106.14.20.193:8086/api/aliPayBillNotify
-  wx-car-notify: http://106.14.20.193:8086/api/wxCarNotify
-  ali-car-notify: http://106.14.20.193:8086/api/aliPayCarNotify
-  wx-tmp-notify: http://106.14.20.193:8086/api/wxTmpNotify
-  ali-tmp-notify: http://106.14.20.193:8086/api/aliTmpNotify
+  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  ali-bill-notify:
+  wx-car-notify:
+  ali-car-notify:
+  wx-tmp-notify:
+  ali-tmp-notify:
 
 #法大大服务器地址
 fadada: