快捷支付退款bugfix

pom.xml

@@ -744,8 +744,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcmail-jdk15</artifactId>
-			<version>1.46</version>
+			<artifactId>bcprov-jdk15to18</artifactId>
+			<version>1.69</version>
 		</dependency>
 		<!--twelvemonkeys图片处理-->
 		<dependency>

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -728,7 +728,6 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                         String content = "【采美365】订单（" + name + "等" + productCount + "件商品）已全部退款成功，退款金额￥" + returnedPurchase.getRefundFee() + "。您可点击采美网址www.caimei.com 或使用微信小程序“采美采购商城”查看订单。";
                         sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
                     } else if ("2".equals(newOrder.getRefundType())) {
-
                         Date date = new Date();
                         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
                         //推送信息中心-交易物流
@@ -745,11 +744,10 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                         messageCenterDao.addMessageCenter(messageCenter);
                         //全部退
                         String name = newOrder.getProductName();
-                        if (name.length() > 10) {
+                        if (StringUtils.isNotBlank(name) && name.length() > 10) {
                             name = StringUtils.strip(name.substring(0, 11));
                             name += "...";
                         }
-                        String shortLink = newOrderService.getShortLink(8, 10, wwwServer + "user/order/detail.html?orderId=" + newOrder.getOrderID());
                         String content = "【采美365】订单（" + name + "等" + productCount + "件商品）已部份退款成功，退款金额￥" + returnedPurchase.getRefundFee() + "。您可点击采美网址www.caimei.com 或使用微信小程序“采美采购商城”查看订单。";
                         sendSms = newOrderService.getSendSms(10, user.getBindMobile(), content);
                     }
@@ -863,9 +861,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                          * [{ 'splitBillMerchantEmail': 'xun.zhang@caimei365.com','refundAmount': 0.12}]
                          */
                         String email = cmReturnedPurchaseDao.findSplitCodeEmail(splitCode);
-                        String refundJson = "[{ 'splitBillMerchantEmail': " + email + ",'refundAmount': " + value + "}]";
+                        String refundJson = "[{ 'splitBillMerchantEmail': '" + email + "','refundAmount': " + value + "}]";
                         quickPaySpRefundVo.setP5_ruleJson(refundJson);
-                        quickPaySpRefundVo.setP6_callbackUrl("");
+                        quickPaySpRefundVo.setP6_callbackUrl("localhost:8080/manager");
                         quickPaySpRefundVo.setSignatureType("SM3WITHSM2");
                         Map reqestMap = MessageHandle.getReqestMap(quickPaySpRefundVo);
                         Map<String, Object> resultMap = HttpClientService.getHttpResp(reqestMap, Constant.REQUEST_URL_QUICKPAY);