2023年2月8日20:30:09

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/ocean/fegin/IOceanShippingBillClient.java

@@ -1,6 +1,5 @@
 package org.springblade.box.tube.ocean.fegin;
 
-import org.springblade.box.tube.entity.TransportItemFees;
 import org.springblade.box.tube.ocean.entity.ShippingBill;
 import org.springblade.box.tube.ocean.entity.ShippingFees;
 import org.springblade.core.tool.api.R;

blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/fegin/IPaymentClient.java

@@ -0,0 +1,30 @@
+package org.springblade.pay.tonglianPayment.fegin;
+
+
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springblade.purchase.sales.entity.Order;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@FeignClient(
+	value = "blade-payment"
+)
+public interface IPaymentClient {
+
+	String APP_PREFIX = "/pay";
+	String GET_BY_ID = APP_PREFIX + "/WeChatPayment";
+	String PAY_PREPAY = APP_PREFIX + "/payPrepay";
+
+	@PostMapping(GET_BY_ID)
+	R getWeChatPayment(@RequestBody Order order);
+
+	@PostMapping(PAY_PREPAY)
+	R<Map<Object, Object>> payPrepay(long trxamt, String reqsn, String paytype, String body, String remark, String acct, String validtime, String notify_url, String limit_pay,
+									 String idno, String truename, String asinfo, String sub_appid, String goods_tag, String benefitdetail, String chnlstoreid, String subbranch, String extendparams, String cusip, String fqnum);
+
+
+}

blade-service-api/blade-payment-api/src/main/java/org/springblade/payment/tonglianPayment/fegin/IPaymentClient.java

@@ -1,22 +0,0 @@
-package org.springblade.payment.tonglianPayment.fegin;
-
-
-import org.springblade.core.tool.api.R;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springblade.purchase.sales.entity.Order;
-
-@FeignClient(
-	value = "blade-payment"
-)
-public interface IPaymentClient {
-
-	String APP_PREFIX = "/payment";
-	String GET_BY_ID = APP_PREFIX + "/WeChatPayment";
-
-	@PostMapping(GET_BY_ID)
-	R getWeChatPayment(@RequestBody Order order);
-
-
-}

blade-service/blade-payment/pom.xml → blade-service/blade-pay/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-payment</artifactId>
+    <artifactId>blade-pay</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -55,6 +55,7 @@
         </dependency>
     </dependencies>
 
+
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/PaymentApplication.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/PaymentApplication.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.payment.tonglianPayment;
+package org.springblade.pay.tonglianPayment;
 
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
@@ -36,7 +36,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 public class PaymentApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run("blade-payment", PaymentApplication.class, args);
+		BladeApplication.run("blade-pay", PaymentApplication.class, args);
 	}
 
 }

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/controller/TongLianPaymentController.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/TongLianPaymentController.java

@@ -14,18 +14,18 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.payment.tonglianPayment.controller;
+package org.springblade.pay.tonglianPayment.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
-import org.springblade.payment.tonglianPayment.method.NotifyServlet;
-import org.springblade.payment.tonglianPayment.service.IPaymentService;
-import org.springblade.payment.tonglianPayment.utils.AnalysisMapUtils;
-import org.springblade.payment.tonglianPayment.utils.SybConstants;
-import org.springblade.payment.tonglianPayment.utils.SybUtil;
+import org.springblade.pay.tonglianPayment.utils.AnalysisMapUtils;
+import org.springblade.pay.tonglianPayment.utils.SybConstants;
+import org.springblade.pay.tonglianPayment.utils.SybUtil;
+import org.springblade.pay.tonglianPayment.method.NotifyServlet;
+import org.springblade.pay.tonglianPayment.service.IPaymentService;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.system.cache.ParamCache;

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/feign/PaymentClient.java

@@ -0,0 +1,93 @@
+package org.springblade.pay.tonglianPayment.feign;
+
+
+import com.alibaba.fastjson.JSON;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
+import org.springblade.pay.tonglianPayment.service.IPaymentService;
+import org.springblade.pay.tonglianPayment.utils.AnalysisMapUtils;
+import org.springblade.pay.tonglianPayment.utils.SybPayService;
+import org.springblade.purchase.sales.entity.Order;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class PaymentClient implements IPaymentClient {
+	private final IPaymentService paymentService;//支付
+
+	@Override
+	public R getWeChatPayment(Order order) {
+		return paymentService.getWeChatPayment(order);
+	}
+
+	@Override
+	public R<Map<Object, Object>> payPrepay(long trxamt, String reqsn, String paytype, String body,
+											String remark, String acct, String validtime, String notify_url,
+											String limit_pay, String idno, String truename, String asinfo,
+											String sub_appid, String goods_tag, String benefitdetail, String chnlstoreid,
+											String subbranch, String extendparams, String cusip, String fqnum) {
+		SybPayService service = new SybPayService();
+		//https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=3
+		Map<Object, Object> resultObj = new TreeMap();
+		//"https://test.allinpaygd.com/JWeb/NotifyServlet"
+		try {
+			Map<String, String> map = service.pay(trxamt, reqsn, paytype, body, remark, acct, validtime, notify_url,
+				limit_pay, idno, truename, asinfo, sub_appid, goods_tag, benefitdetail, chnlstoreid, subbranch, extendparams, cusip, fqnum);
+			print(map);
+
+			Map<String, String> mapType = null;
+			if (map != null) {
+				for (Object key : map.keySet()) {
+					if (key.equals("payinfo")) {
+						mapType = JSON.parseObject((String) map.get(key), Map.class);
+					}
+				}
+			}
+			// print(map);
+			if (map == null) {
+				throw new Exception("返回数据错误");
+			}
+			String return_code = AnalysisMapUtils.getString("retcode", map);
+			String return_msg = AnalysisMapUtils.getString("retmsg", map);
+			if (return_code.equalsIgnoreCase("FAIL")) {
+				throw new RuntimeException("支付失败," + return_msg);
+			} else if (return_code.equalsIgnoreCase("SUCCESS")) {
+				// 返回数据
+				String prepay_id = AnalysisMapUtils.getString("prepay_id", mapType);
+				// 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
+				resultObj.put("appId", AnalysisMapUtils.getString("appId", mapType));
+				resultObj.put("timeStamp", AnalysisMapUtils.getString("timeStamp", mapType));
+				resultObj.put("nonceStr", AnalysisMapUtils.getString("nonceStr", mapType));
+				resultObj.put("package", AnalysisMapUtils.getString("package", mapType));
+				resultObj.put("signType", AnalysisMapUtils.getString("signType", mapType));
+				String paySign = AnalysisMapUtils.getString("paySign", mapType);
+				resultObj.put("paySign", paySign);
+				resultObj.put("prepay_id", prepay_id);
+				return R.data(resultObj);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("下单失败,error=" + e.getMessage());
+		}
+		return R.fail("下单失败");
+	}
+
+	public static void print(Map<String, String> map) {
+		System.out.println("返回数据如下:");
+		if (map != null) {
+			for (String key : map.keySet()) {
+				System.out.println(key + ";" + map.get(key));
+			}
+		}
+	}
+
+
+}

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/method/ApiTestV2.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/method/ApiTestV2.java

@@ -1,7 +1,7 @@
-package org.springblade.payment.tonglianPayment.method;
+package org.springblade.pay.tonglianPayment.method;
 
 
-import org.springblade.payment.tonglianPayment.utils.SybPayService;
+import org.springblade.pay.tonglianPayment.utils.SybPayService;
 
 import java.util.Map;
 

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/method/NotifyServlet.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/method/NotifyServlet.java

@@ -1,7 +1,7 @@
-package org.springblade.payment.tonglianPayment.method;
+package org.springblade.pay.tonglianPayment.method;
 
-import org.springblade.payment.tonglianPayment.utils.SybConstants;
-import org.springblade.payment.tonglianPayment.utils.SybUtil;
+import org.springblade.pay.tonglianPayment.utils.SybConstants;
+import org.springblade.pay.tonglianPayment.utils.SybUtil;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/service/IPaymentService.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/IPaymentService.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.service;
+package org.springblade.pay.tonglianPayment.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.tool.api.R;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/service/impl/PaymentServiceImpl.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.service.impl;
+package org.springblade.pay.tonglianPayment.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -9,9 +9,9 @@ import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.ITongLianPaymentClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.payment.tonglianPayment.service.IPaymentService;
-import org.springblade.payment.tonglianPayment.utils.AnalysisMapUtils;
-import org.springblade.payment.tonglianPayment.utils.SybPayService;
+import org.springblade.pay.tonglianPayment.utils.AnalysisMapUtils;
+import org.springblade.pay.tonglianPayment.utils.SybPayService;
+import org.springblade.pay.tonglianPayment.service.IPaymentService;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.feign.IOrderDescClient;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/AnalysisMapUtils.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/AnalysisMapUtils.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import java.util.Map;
 

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/HttpConnectionUtil.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/HttpConnectionUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/RandomStringUtils.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/RandomStringUtils.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import java.util.Random;
 

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/SSLUtil.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SSLUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/SmUtil.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SmUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.asn1.ASN1EncodableVector;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/SybConstants.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybConstants.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 public class SybConstants {
 

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/SybPayService.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybPayService.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import org.springblade.system.cache.ParamCache;
 

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/utils/SybUtil.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.tonglianPayment.utils;
+package org.springblade.pay.tonglianPayment.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.binary.Base64;

blade-service/blade-payment/src/main/java/org/springblade/payment/tonglianPayment/feign/PaymentClient.java

@@ -1,25 +0,0 @@
-package org.springblade.payment.tonglianPayment.feign;
-
-
-import lombok.AllArgsConstructor;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springblade.payment.tonglianPayment.fegin.IPaymentClient;
-import org.springblade.payment.tonglianPayment.service.IPaymentService;
-import org.springblade.purchase.sales.entity.Order;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@NonDS
-@ApiIgnore()
-@RestController
-@AllArgsConstructor
-public class PaymentClient implements IPaymentClient {
-	private final IPaymentService paymentService;//支付
-
-	@Override
-	public R getWeChatPayment(Order order) {
-		return paymentService.getWeChatPayment(order);
-	}
-
-}

blade-service/blade-purchase-sales/pom.xml

@@ -95,12 +95,6 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-payment</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.purchase.sales.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -52,9 +51,7 @@ import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.land.entity.LandOrder;
 import org.springblade.land.feign.ILandClient;
-import org.springblade.payment.tonglianPayment.fegin.IPaymentClient;
-import org.springblade.payment.tonglianPayment.utils.AnalysisMapUtils;
-import org.springblade.payment.tonglianPayment.utils.SybPayService;
+import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
 import org.springblade.purchase.sales.entity.*;
 import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.excel.*;
@@ -77,7 +74,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import javax.sql.rowset.serial.SerialException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
@@ -85,7 +81,6 @@ import java.math.RoundingMode;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static org.springblade.common.constant.TenantConstant.*;
 
@@ -154,6 +149,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final ITongLianPaymentClient tongLianPaymentClient;//支付
 
+	private final IPaymentClient paymentClient;//支付
+
 	/**
 	 * 库区信息
 	 */
@@ -281,7 +278,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				String[] arrs = order.getSrcOrderNo().split(",");
 				for (String arr : arrs) {
 					Order order1 = baseMapper.selectOne(new LambdaQueryWrapper<Order>().eq(Order::getSysNo, arr));
-					if (ObjectUtils.isNotNull(order1)){
+					if (ObjectUtils.isNotNull(order1)) {
 						order1.setSrcOrderNo(order.getSysNo());
 						baseMapper.updateById(order1);
 					}
@@ -1140,11 +1137,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public void checkChargeBack(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
 
-		if (ObjectUtil.isEmpty(salesOrder)){//判断单据是否存在
+		if (ObjectUtil.isEmpty(salesOrder)) {//判断单据是否存在
 			throw new SecurityException("单据信息异常");
 		}
 
-		if (salesOrder.getChargebackStatus() == 1){
+		if (salesOrder.getChargebackStatus() == 1) {
 			throw new SecurityException("订单已开启审核,请勿重复提交");
 		}
 
@@ -1153,7 +1150,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(Order::getIsDeleted, 0)
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getSrcId, salesOrder.getId()));
-		if (ObjectUtil.isNotEmpty(orderPurchase)){//判断采购订单是否存在
+		if (ObjectUtil.isNotEmpty(orderPurchase)) {//判断采购订单是否存在
 			throw new SecurityException("采购订单已存在,禁止撤销");
 		}
 
@@ -1485,7 +1482,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public void checkPassCancel(Long id) {
 		//获得当前销售订单信息
 		Order orderMessage = baseMapper.selectById(id);
-		if (orderMessage == null){//判断销售订单是否为null
+		if (orderMessage == null) {//判断销售订单是否为null
 			throw new SecurityException("撤销失败");
 		}
 
@@ -1537,7 +1534,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 					//删除明细
 					int res = orderItemsMapper.deleteById(e.getId());
-					if (res != 1){
+					if (res != 1) {
 						throw new SecurityException("撤销失败,明细错误");
 					}
 				});
@@ -4793,12 +4790,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (r.isSuccess() && ObjectUtils.isNull(r.getData())) {
 			throw new RuntimeException("未找到用户信息");
 		}
-
-
-		SybPayService service = new SybPayService();
-		//https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=3
 		Map<Object, Object> resultObj = new TreeMap();
-		//"https://test.allinpaygd.com/JWeb/NotifyServlet"
 		try {
 			// body 订单标题
 			LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -4817,7 +4809,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					body = body.substring(0, body.length() - 1);
 				}
 			}
-			Map<String, String> map = service.pay(orderInfo.getDebitAmount().multiply(new BigDecimal(100)).intValue(),
+			R<Map<Object, Object>> res = paymentClient.payPrepay(orderInfo.getDebitAmount().multiply(new BigDecimal(100)).intValue(),
 				orderInfo.getSysNo(),
 				parameters.getPayType(),
 				body,
@@ -4837,57 +4829,23 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				"",
 				parameters.getCusIp(),
 				"");
-			print(map);
 
-			Map<String, String> mapType = null;
-			if (map != null) {
-				for (Object key : map.keySet()) {
-					if (key.equals("payinfo")) {
-						mapType = JSON.parseObject((String) map.get(key), Map.class);
-					}
-				}
-			}
-			// print(map);
-			if (map == null) {
-				throw new Exception("返回数据错误");
-			}
-			String return_code = AnalysisMapUtils.getString("retcode", map);
-			String return_msg = AnalysisMapUtils.getString("retmsg", map);
-			if (return_code.equalsIgnoreCase("FAIL")) {
-				throw new RuntimeException("支付失败," + return_msg);
-			} else if (return_code.equalsIgnoreCase("SUCCESS")) {
-				// 返回数据
-				String prepay_id = AnalysisMapUtils.getString("prepay_id", mapType);
-				// 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
-				resultObj.put("appId", AnalysisMapUtils.getString("appId", mapType));
-				resultObj.put("timeStamp", AnalysisMapUtils.getString("timeStamp", mapType));
-				resultObj.put("nonceStr", AnalysisMapUtils.getString("nonceStr", mapType));
-				resultObj.put("package", AnalysisMapUtils.getString("package", mapType));
-				resultObj.put("signType", AnalysisMapUtils.getString("signType", mapType));
-				String paySign = AnalysisMapUtils.getString("paySign", mapType);
-				resultObj.put("paySign", paySign);
+			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+				String prepay_id = res.getData().get("prepay_id").toString();
 				// 业务处理
 				orderInfo.setPrepayId(prepay_id);
 				// 付款中
 				orderInfo.setActualPaymentStatus(1);
 				//更新订单表
 				baseMapper.updateById(orderInfo);
-				return R.data(resultObj);
+				return R.data(res.getData());
+			} else {
+				throw new RuntimeException("下单失败");
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new RuntimeException("下单失败,error=" + e.getMessage());
 		}
-		return R.data("下单失败");
-	}
-
-	public static void print(Map<String, String> map) {
-		System.out.println("返回数据如下:");
-		if (map != null) {
-			for (String key : map.keySet()) {
-				System.out.println(key + ";" + map.get(key));
-			}
-		}
 	}
 
 	@Override

blade-service/pom.xml

@@ -35,7 +35,7 @@
         <module>blade-school</module>
         <module>blade-land</module>
         <module>blade-box-tube</module>
-        <module>blade-payment</module>
+        <module>blade-pay</module>
     </modules>
 
     <dependencies>