|
|
@@ -313,12 +313,12 @@ public class OrderRefundServiceImpl implements OrderRefundService {
|
|
|
//退款原单号
|
|
|
orderVo.setP2_orderId(relationPo.getOrderRequestNo());
|
|
|
//自定义退款单号
|
|
|
- String tk = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
|
|
|
+ String tk = new SimpleDateFormat("ddHHmmss").format(new Date());
|
|
|
orderVo.setP4_refundOrderId("TK" + tk + relationPo.getOrderRequestNo());
|
|
|
//退款金额
|
|
|
orderVo.setP5_amount(relationPo.getAssociateAmount().toString());
|
|
|
Map<String, String> map = MyBeanUtils.convertBean(orderVo, new LinkedHashMap());
|
|
|
- String oriMessage = MyBeanUtils.getSignedByPresetParameter(map, AppPayRefundOrderVo.NEED_SIGN_PARAMS);
|
|
|
+ String oriMessage = MyBeanUtils.getSignedByPresetParameter(map, AppPayRefundOrderVo.NEED_SIGN_PARAMS) + Constant.SPLIT;
|
|
|
oriMessage += Constant.SAOMA;
|
|
|
String sign = Disguiser.disguiseMD5(oriMessage.trim());
|
|
|
log.info("签名串：" + sign);
|
|
|
@@ -329,7 +329,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
|
|
|
if ((Integer) resultMap.get("statusCode") == HttpStatus.SC_OK) {
|
|
|
String resultMsg = (String) resultMap.get("response");
|
|
|
AppPayRefundOrderResponseVo orderResponseVo = JSONObject.parseObject(resultMsg, AppPayRefundOrderResponseVo.class);
|
|
|
- String assemblyRespOriSign = MyBeanUtils.getSignedByPresetParameter(orderResponseVo, AppPayRefundOrderResponseVo.NEED_SIGN_PARAMS);
|
|
|
+ String assemblyRespOriSign = MyBeanUtils.getSignedByPresetParameter(orderResponseVo, AppPayRefundOrderResponseVo.NEED_SIGN_PARAMS) + Constant.SPLIT;
|
|
|
assemblyRespOriSign += Constant.SAOMA;
|
|
|
log.info("组装返回结果签名串：" + assemblyRespOriSign);
|
|
|
String responseSign = orderResponseVo.getSign();
|
|
|
@@ -372,7 +372,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
|
|
|
String email = refundMapper.findSplitCodeEmail(splitCode);
|
|
|
String refundJson = "[{ 'splitBillMerchantEmail': '" + email + "','refundAmount': " + relationPo.getAssociateAmount() + "}]";
|
|
|
quickPaySpRefundVo.setP5_ruleJson(refundJson);
|
|
|
- quickPaySpRefundVo.setP6_callbackUrl("localhost:8080/manager");
|
|
|
+ quickPaySpRefundVo.setP6_callbackUrl("");
|
|
|
quickPaySpRefundVo.setSignatureType("SM3WITHSM2");
|
|
|
Map reqestMap = MessageHandle.getReqestMap(quickPaySpRefundVo);
|
|
|
Map<String, Object> resultMap = HttpClientService.getHttpResp(reqestMap, Constant.REQUEST_URL_QUICKPAY);
|
zhijiezhao