Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/dto/PaymentDTO.java

@@ -1,5 +1,6 @@
 package org.springblade.pay.tonglianPayment.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -28,6 +29,21 @@ public class PaymentDTO {
 	private String fqnum;
 	private String oldreqsn;
 	private String oldtrxid;
+	private String cusId;
+	private String appId;
 
+	private String orgid;
+
+	private String transactionType;
+
+	private String sybMdAppkey;
+
+	private String sybRsacusprikey;
+
+	private String sybRsatlpubkey;
+
+	private String sybSmpprivatekey;
+
+	private String sybSmtlpubkey;
 
 }

blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/entity/Parameters.java

@@ -166,5 +166,40 @@ public class Parameters implements Serializable {
 	@ApiModelProperty(value = "小程序的appSecret")
 	private String appSecret;
 
+	/**
+	 * 交易类型
+	 */
+	@ApiModelProperty(value = "交易类型")
+	private String transactionType;
+
+	/**
+	 * MD5交易密钥
+	 */
+	@ApiModelProperty(value = "MD5交易密钥")
+	private String sybMdAppkey;
+
+	/**
+	 * RSA公钥
+	 */
+	@ApiModelProperty(value = "RSA公钥")
+	private String sybRsacusprikey;
+
+	/**
+	 * RSA2公钥
+	 */
+	@ApiModelProperty(value = "RSA2公钥")
+	private String sybRsatlpubkey;
+
+	/**
+	 * 商户sm2私钥
+	 */
+	@ApiModelProperty(value = "商户sm2私钥")
+	private String sybSmpprivatekey;
+
+	/**
+	 * 通联平台sm2公钥
+	 */
+	@ApiModelProperty(value = "通联平台sm2公钥")
+	private String sybSmtlpubkey;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderFees.java

@@ -186,9 +186,15 @@ public class OrderFees implements Serializable {
 
 	private BigDecimal refundSettlmentAmount;
 
+	/**
+	 * 0 未审核 1已审核
+	 */
 	@ApiModelProperty(value = "0 未审核 1已审核")
 	private Integer isCheck;
 
+	/**
+	 * 生成货款
+	 */
 	@ApiModelProperty(value = "生成货款")
 	private Integer submitPay;
 

blade-service/blade-land/src/main/java/org/springblade/land/insurance/service/impl/InsuranceServiceImpl.java

@@ -139,6 +139,8 @@ public class InsuranceServiceImpl extends ServiceImpl<InsuranceMapper, Insurance
 	public IPage<Insurance> getList(Insurance insurance, Query query){
 		LambdaQueryWrapper<Insurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(ObjectUtil.isNotEmpty(insurance.getCarNumberName()), Insurance::getCarNumberId, insurance.getCarNumberName())//车号
+			.eq(Insurance::getTenantId, AuthUtil.getTenantId())
+			.eq(Insurance::getIsDeleted, 0)
 			.eq(ObjectUtil.isNotEmpty(insurance.getStatus()), Insurance::getStatus, insurance.getStatus());//状态
 
 		//根据当前登录人获得客户联系人

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

@@ -102,6 +102,7 @@ public class TongLianPaymentController extends BladeController {
 			request.setCharacterEncoding("UTF-8");//通知传输的编码为GBK
 			response.setCharacterEncoding("UTF-8");
 			TreeMap<String, String> params = NotifyServlet.getParams(request);
+			System.out.println("回调函数数据======》" + params.toString());
 			String appKey;
 			if ("RSA".equals(params.get("signtype"))) {
 				appKey = SybConstants.SYB_RSATLPUBKEY;

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

@@ -43,11 +43,14 @@ public class PaymentClient implements IPaymentClient {
 		Map<Object, Object> resultObj = new TreeMap();
 		//"https://test.allinpaygd.com/JWeb/NotifyServlet"
 		try {
+			System.out.println("支付函数数据======》"+paymentDTO.toString());
 			Map<String, String> map = service.pay(paymentDTO.getTrxamt(), paymentDTO.getReqsn(), paymentDTO.getPaytype(),
 				paymentDTO.getBody(), paymentDTO.getRemark(), paymentDTO.getAcct(), paymentDTO.getValidtime(), paymentDTO.getNotify_url(),
 				paymentDTO.getLimit_pay(), paymentDTO.getIdno(), paymentDTO.getTruename(), paymentDTO.getAsinfo(),
 				paymentDTO.getSub_appid(), paymentDTO.getGoods_tag(), paymentDTO.getBenefitdetail(), paymentDTO.getChnlstoreid(),
-				paymentDTO.getSubbranch(), paymentDTO.getExtendparams(), paymentDTO.getCusip(), paymentDTO.getFqnum());
+				paymentDTO.getSubbranch(), paymentDTO.getExtendparams(), paymentDTO.getCusip(), paymentDTO.getFqnum(), paymentDTO.getCusId(),
+				paymentDTO.getAppId(), paymentDTO.getOrgid(), paymentDTO.getTransactionType(), paymentDTO.getSybMdAppkey(), paymentDTO.getSybRsacusprikey(),
+				paymentDTO.getSybRsatlpubkey(), paymentDTO.getSybSmpprivatekey(), paymentDTO.getSybSmtlpubkey());
 			print(map);
 
 			Map<String, String> mapType = null;
@@ -98,7 +101,9 @@ public class PaymentClient implements IPaymentClient {
 			wechatMark.setSrcBillNo(paymentDTO.getOldreqsn());
 			wechatMark.setSerialNumber(paymentDTO.getOldtrxid());
 			wechatMark.setAmount(new BigDecimal(paymentDTO.getTrxamt()));
-			Map<String, String> map = service.refund(paymentDTO.getTrxamt(), paymentDTO.getReqsn(), paymentDTO.getOldtrxid(), paymentDTO.getOldreqsn());
+			Map<String, String> map = service.refund(paymentDTO.getTrxamt(), paymentDTO.getReqsn(), paymentDTO.getOldtrxid(), paymentDTO.getOldreqsn(), paymentDTO.getCusId(),
+				paymentDTO.getAppId(), paymentDTO.getOrgid(), paymentDTO.getTransactionType(), paymentDTO.getSybMdAppkey(), paymentDTO.getSybRsacusprikey(), paymentDTO.getSybRsatlpubkey(),
+				paymentDTO.getSybSmpprivatekey(), paymentDTO.getSybSmtlpubkey());
 			print(map);
 			if (map == null) {
 				throw new Exception("返回数据错误");

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

@@ -33,7 +33,8 @@ public class ApiTestV2 {
 	public static void testRefund() throws Exception {
 		SybPayService service = new SybPayService();
 		String reqsn = String.valueOf(System.currentTimeMillis());
-		Map<String, String> map = service.refund(1, reqsn, "", "20160712167578.2547");
+		Map<String, String> map = service.refund(1, reqsn, "", "20160712167578.2547", "", "", "", "",
+			"", "", "", "", "");
 		print(map);
 	}
 
@@ -47,7 +48,9 @@ public class ApiTestV2 {
 	public static void testPay() throws Exception {
 		SybPayService service = new SybPayService();
 		String reqsn = String.valueOf(System.currentTimeMillis());
-		Map<String, String> map = service.pay(1, reqsn, "W01", "标题", "备注", "", "123", "https://test.allinpaygd.com/JWeb/NotifyServlet", "", "", "", "", "", "", "", "", "", "", "", "");
+		Map<String, String> map = service.pay(1, reqsn, "W01", "标题", "备注", "", "123", "https://test.allinpaygd.com/JWeb/NotifyServlet", "",
+			"", "", "", "", "", "", "", "", "", "",
+			"", "", "", "", "", "", "", "", "", "");
 		print(map);
 	}
 

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

@@ -118,7 +118,16 @@ public class PaymentServiceImpl implements IPaymentService {
 				"",
 				"",
 				parameters.getCusIp(),
-				"");
+				"",
+				parameters.getCusId(),
+				parameters.getAppId(),
+				parameters.getOrgid(),
+				parameters.getTransactionType(),
+				parameters.getSybMdAppkey(),
+				parameters.getSybRsacusprikey(),
+				parameters.getSybRsatlpubkey(),
+				parameters.getSybSmpprivatekey(),
+				parameters.getSybSmtlpubkey());
 			print(map);
 
 			Map<String, String> mapType = null;

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

@@ -33,14 +33,16 @@ public class SybPayService {
 	 * @param goods_tag           单品优惠信息
 	 * @param chnlstoreid
 	 * @param subbranch
-	 * @param extendparams具体见接口文档
+	 * @param extendparams 		  具体见接口文档
 	 * @param cusip               限云闪付JS支付业务
 	 * @param fqnum               限支付宝分期业务
 	 * @return
 	 * @throws Exception
 	 */
 	public Map<String, String> pay(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) throws Exception {
+								   String idno, String truename, String asinfo, String sub_appid, String goods_tag, String benefitdetail, String chnlstoreid, String subbranch,
+								   String extendparams, String cusip, String fqnum, String cusId, String appId, String orgid, String transactionType, String sybMdAppkey,
+								   String sybRsacusprikey, String sybRsatlpubkey, String sybSmpprivatekey, String sybSmtlpubkey) throws Exception {
 
 
 		TreeMap<String, String> params = new TreeMap<String, String>();
@@ -50,14 +52,16 @@ public class SybPayService {
 			params.put("appid", SybConstants.SYB_APPID_TEST);
 			url = SybConstants.SYB_APIURL_TEST;
 		} else {*/
-		params.put("cusid", SybConstants.SYB_CUSID);
-		params.put("appid", SybConstants.SYB_APPID);
+		//params.put("cusid", SybConstants.SYB_CUSID);
+		//params.put("appid", SybConstants.SYB_APPID);
+		params.put("cusid", cusId);
+		params.put("appid", appId);
 		url = SybConstants.SYB_APIURL;
 		/*}*/
 		HttpConnectionUtil http = new HttpConnectionUtil(url + "/pay");
 		http.init();
-		if (!SybUtil.isEmpty(SybConstants.SYB_ORGID))
-			params.put("orgid", SybConstants.SYB_ORGID);
+		if (!SybUtil.isEmpty(orgid))
+			params.put("orgid", orgid);
 		params.put("version", "11");
 		params.put("trxamt", String.valueOf(trxamt));
 		params.put("reqsn", reqsn);
@@ -92,22 +96,25 @@ public class SybPayService {
 				appkey = SybConstants.SYB_MD5_APPKEY_TEST;
 			params.put("sign", SybUtil.unionSign(params, appkey, SybConstants.SIGN_TYPE_TEST));
 		} else {*/
-		params.put("signtype", SybConstants.SIGN_TYPE);
+		params.put("signtype", transactionType);
 		String appkey = "";
-		if (SybConstants.SIGN_TYPE.equals("RSA"))
-			appkey = SybConstants.SYB_RSACUSPRIKEY;
-		else if (SybConstants.SIGN_TYPE.equals("SM2"))
-			appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+		if (transactionType.equals("RSA"))
+			//appkey = SybConstants.SYB_RSACUSPRIKEY;
+			appkey =sybRsacusprikey;
+		else if (transactionType.equals("SM2"))
+			//appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+			appkey = sybSmpprivatekey;
 		else
-			appkey = SybConstants.SYB_MD5_APPKEY;
-		params.put("sign", SybUtil.unionSign(params, appkey, SybConstants.SIGN_TYPE));
+			//appkey = SybConstants.SYB_MD5_APPKEY;
+			appkey = sybMdAppkey;
+		params.put("sign", SybUtil.unionSign(params, appkey, transactionType));
 //		}
 		System.out.println("请求数据===" + params);
 		byte[] bys = http.postParams(params, true);
 		System.out.println("第二步===" + bys);
 		String result = new String(bys, "UTF-8");
 		System.out.println("第三步===" + result);
-		Map<String, String> map = handleResult(result);
+		Map<String, String> map = handleResult(result, transactionType, sybRsacusprikey, sybSmpprivatekey, sybMdAppkey);
 		System.out.println("第四步===" + map);
 		return map;
 
@@ -158,17 +165,18 @@ public class SybPayService {
 //		}
 		byte[] bys = http.postParams(params, true);
 		String result = new String(bys, "UTF-8");
-		Map<String, String> map = handleResult(result);
+		Map<String, String> map = handleResult(result, SybConstants.SIGN_TYPE, SybConstants.SYB_RSACUSPRIKEY, SybConstants.SYB_SM2PPRIVATEKEY, SybConstants.SYB_MD5_APPKEY);
 		return map;
 	}
 
-	public Map<String, String> refund(long trxamt, String reqsn, String oldtrxid, String oldreqsn) throws Exception {
+	public Map<String, String> refund(long trxamt, String reqsn, String oldtrxid, String oldreqsn, String cusId, String appId, String orgid, String transactionType, String sybMdAppkey,
+									  String sybRsacusprikey, String sybRsatlpubkey, String sybSmpprivatekey, String sybSmtlpubkey) throws Exception {
 		TreeMap<String, String> params = new TreeMap<String, String>();
-		if (!SybUtil.isEmpty(SybConstants.SYB_ORGID))
-			params.put("orgid", SybConstants.SYB_ORGID);
+		if (!SybUtil.isEmpty(orgid))
+			params.put("orgid", orgid);
 		String url = "";
-		params.put("cusid", SybConstants.SYB_CUSID);
-		params.put("appid", SybConstants.SYB_APPID);
+		params.put("cusid", cusId);
+		params.put("appid", appId);
 		url = SybConstants.SYB_APIURL;
 		HttpConnectionUtil http = new HttpConnectionUtil(url + "/refund");
 		http.init();
@@ -178,11 +186,11 @@ public class SybPayService {
 		params.put("oldreqsn", oldreqsn);
 		params.put("oldtrxid", oldtrxid);
 		params.put("randomstr", SybUtil.getValidatecode(8));
-		params.put("signtype", SybConstants.SIGN_TYPE);
-		params.put("sign", SybUtil.unionSign(params, SybConstants.SYB_MD5_APPKEY, SybConstants.SIGN_TYPE));
+		params.put("signtype", transactionType);
+		params.put("sign", SybUtil.unionSign(params, sybMdAppkey, transactionType));
 		byte[] bys = http.postParams(params, true);
 		String result = new String(bys, "UTF-8");
-		Map<String, String> map = handleResult(result);
+		Map<String, String> map = handleResult(result, transactionType, sybRsacusprikey, sybSmpprivatekey, sybMdAppkey);
 		return map;
 	}
 
@@ -229,13 +237,13 @@ public class SybPayService {
 //		}
 		byte[] bys = http.postParams(params, true);
 		String result = new String(bys, "UTF-8");
-		Map<String, String> map = handleResult(result);
+		Map<String, String> map = handleResult(result, SybConstants.SIGN_TYPE, SybConstants.SYB_RSACUSPRIKEY, SybConstants.SYB_SM2PPRIVATEKEY, SybConstants.SYB_MD5_APPKEY);
 		return map;
 	}
 
 
 	@SuppressWarnings({"rawtypes", "unchecked"})
-	public static Map<String, String> handleResult(String result) throws Exception {
+	public static Map<String, String> handleResult(String result, String transactionType, String sybRsacusprikey, String sybSmpprivatekey, String sybMdAppkey) throws Exception {
 		System.out.println("ret:" + result);
 		Map map = SybUtil.json2Obj(result, Map.class);
 		if (map == null) {
@@ -245,13 +253,13 @@ public class SybPayService {
 			TreeMap tmap = new TreeMap();
 			tmap.putAll(map);
 			String appkey = "";
-			if (SybConstants.SIGN_TYPE.equals("RSA"))
-				appkey = SybConstants.SYB_RSATLPUBKEY;
-			else if (SybConstants.SIGN_TYPE.equals("SM2"))
-				appkey = SybConstants.SYB_SM2TLPUBKEY;
+			if (transactionType.equals("RSA"))
+				appkey = sybRsacusprikey;
+			else if (transactionType.equals("SM2"))
+				appkey = sybSmpprivatekey;
 			else
-				appkey = SybConstants.SYB_MD5_APPKEY;
-			if (SybUtil.validSign(tmap, appkey, SybConstants.SIGN_TYPE)) {
+				appkey = sybMdAppkey;
+			if (SybUtil.validSign(tmap, appkey, transactionType)) {
 				System.out.println("签名成功");
 				return map;
 			} else {
@@ -313,7 +321,7 @@ public class SybPayService {
 //		}
 		byte[] bys = http.postParams(params, true);
 		String result = new String(bys, "UTF-8");
-		Map<String, String> map = handleResult(result);
+		Map<String, String> map = handleResult(result, SybConstants.SIGN_TYPE, SybConstants.SYB_RSACUSPRIKEY, SybConstants.SYB_SM2PPRIVATEKEY, SybConstants.SYB_MD5_APPKEY);
 		return map;
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -19,7 +19,9 @@ import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.pay.tonglianPayment.dto.PaymentDTO;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderFiles;
 import org.springblade.purchase.sales.entity.OrderItems;
@@ -60,6 +62,8 @@ public class OrderDescClient implements IOrderDescClient {
 
 	private final IPaymentClient paymentClient;//通联支付
 
+	private final ITongLianPaymentClient tongLianPaymentClient;//支付
+
 	@Override
 	@PostMapping(UPDATE_ORDER)
 	public R updateOrder(Order order) {
@@ -285,6 +289,11 @@ public class OrderDescClient implements IOrderDescClient {
 		if (ObjectUtils.isNull(order)) {
 			throw new SecurityException("未查到订单信息");
 		}
+		Parameters parameters = tongLianPaymentClient.getParametersOne();
+
+		if (ObjectUtils.isNull(parameters)) {
+			throw new RuntimeException("未找到支付信息");
+		}
 		LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderItemsLambdaQueryWrapper.eq(OrderItems::getTenantId, AuthUtil.getTenantId()).eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getPid, order.getId());
 		List<OrderItems> orderItemsList1 = iOrderItemsService.list(orderItemsLambdaQueryWrapper);
@@ -365,6 +374,15 @@ public class OrderDescClient implements IOrderDescClient {
 		paymentDTO.setReqsn(selectOrder.getSysNo());
 		paymentDTO.setOldreqsn(order.getSysNo());
 		paymentDTO.setOldtrxid(order.getOldTrxId());
+		paymentDTO.setCusId(parameters.getCusId());
+		paymentDTO.setAppId(parameters.getAppId());
+		paymentDTO.setOrgid(parameters.getOrgid());
+		paymentDTO.setTransactionType(parameters.getTransactionType());
+		paymentDTO.setSybMdAppkey(parameters.getSybMdAppkey());
+		paymentDTO.setSybRsacusprikey(parameters.getSybRsacusprikey());
+		paymentDTO.setSybRsatlpubkey(parameters.getSybRsatlpubkey());
+		paymentDTO.setSybSmpprivatekey(parameters.getSybSmpprivatekey());
+		paymentDTO.setSybSmtlpubkey(parameters.getSybSmtlpubkey());
 		return paymentClient.refund(paymentDTO);
 	}
 

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

@@ -5011,6 +5011,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			paymentDTO.setExtendparams("");
 			paymentDTO.setCusip(parameters.getCusIp());
 			paymentDTO.setFqnum("");
+			paymentDTO.setCusId(parameters.getCusId());
+			paymentDTO.setAppId(parameters.getAppId());
+			paymentDTO.setOrgid(parameters.getOrgid());
+			paymentDTO.setTransactionType(parameters.getTransactionType());//交易类型
+			paymentDTO.setSybMdAppkey(parameters.getSybMdAppkey());//MD5交易密钥
+			paymentDTO.setSybRsacusprikey(parameters.getSybRsacusprikey());//RSA公钥
+			paymentDTO.setSybRsatlpubkey(parameters.getSybRsatlpubkey());//RSA2公钥
+			paymentDTO.setSybSmpprivatekey(parameters.getSybSmpprivatekey());//商户sm2私钥
+			paymentDTO.setSybSmtlpubkey(parameters.getSybSmtlpubkey());//通联平台sm2公钥
 
 			R<Map<Object, Object>> res = paymentClient.payPrepay(paymentDTO);
 

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -614,6 +614,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			if (!items.getAmount().equals(items.getThisAmount())) {
 				client.setDepositReceived("");
 			} else {
+				client.setDepositReceived("");
 				client.setBalancePayment("");
 			}
 			orderDescClient.updateOrder(client);
@@ -925,6 +926,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			if (!items.getAmount().equals(items.getThisAmount())) {
 				client.setDepositReceived("定金到账");
 			} else {
+				client.setDepositReceived("定金到账");
 				client.setBalancePayment("尾款");
 			}
 			orderDescClient.updateOrder(client);