|
|
@ -89,7 +89,11 @@ public class LaKaLaTradeSeparateService { |
|
|
|
for (BsTradeOrderProfitSharingReceiver receiver : profitSharingReceiverList) { |
|
|
|
for (BsTradeOrderProfitSharingReceiver receiver : profitSharingReceiverList) { |
|
|
|
if (receiver.getReceiverAmount().compareTo(new BigDecimal("0")) != 0) { |
|
|
|
if (receiver.getReceiverAmount().compareTo(new BigDecimal("0")) != 0) { |
|
|
|
recvDatasMap = new HashMap<>(); |
|
|
|
recvDatasMap = new HashMap<>(); |
|
|
|
recvDatasMap.put("recv_no", receiver.getReceiverAccount()); |
|
|
|
if (receiver.getReceiverNo().equals(tradeOrder.getMerNo())) { |
|
|
|
|
|
|
|
recvDatasMap.put("recv_merchant_no", receiver.getReceiverAccount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
recvDatasMap.put("recv_no", receiver.getReceiverAccount()); |
|
|
|
|
|
|
|
} |
|
|
|
recvDatasMap.put("separate_value", receiver.getReceiverAmount().multiply(new BigDecimal("100")).longValue()); |
|
|
|
recvDatasMap.put("separate_value", receiver.getReceiverAmount().multiply(new BigDecimal("100")).longValue()); |
|
|
|
recvDatasMapList.add(recvDatasMap); |
|
|
|
recvDatasMapList.add(recvDatasMap); |
|
|
|
} |
|
|
|
} |
|
|
@ -142,21 +146,21 @@ public class LaKaLaTradeSeparateService { |
|
|
|
return tradeOrderProfitSharing; |
|
|
|
return tradeOrderProfitSharing; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public JSONObject queryAmt(String profitSharingOrderNo) { |
|
|
|
/** |
|
|
|
// 交易订单分账
|
|
|
|
* 查询可分账金额 |
|
|
|
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo); |
|
|
|
* @param outTradeNo |
|
|
|
if (null == tradeOrderProfitSharing) { |
|
|
|
* @return |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "未找到交易分账记录"); |
|
|
|
*/ |
|
|
|
} |
|
|
|
public JSONObject queryAmt(String outTradeNo) { |
|
|
|
// 查询交易详情
|
|
|
|
// 查询交易详情
|
|
|
|
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(tradeOrderProfitSharing.getTradeOrderNo()); |
|
|
|
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(outTradeNo); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> commonParam = new HashMap<>(); |
|
|
|
Map<String, Object> commonParam = new HashMap<>(); |
|
|
|
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); |
|
|
|
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); |
|
|
|
commonParam.put("version", "3.0"); |
|
|
|
commonParam.put("version", "3.0"); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("merchant_no", tradeOrderProfitSharing.getPlatformMerNo()); |
|
|
|
map.put("merchant_no", tradeOrder.getPlatformMerNo()); |
|
|
|
map.put("log_no", tradeOrder.getPlatformLogNo()); |
|
|
|
map.put("log_no", tradeOrder.getPlatformLogNo()); |
|
|
|
map.put("log_date", DateUtil.date2String(tradeOrder.getPayTime(), "yyyyMMdd")); |
|
|
|
map.put("log_date", DateUtil.date2String(tradeOrder.getPayTime(), "yyyyMMdd")); |
|
|
|
commonParam.put("req_data", map); |
|
|
|
commonParam.put("req_data", map); |
|
|
@ -172,8 +176,6 @@ public class LaKaLaTradeSeparateService { |
|
|
|
if (!responseBody.getString("code").equals("SACS0000")) { |
|
|
|
if (!responseBody.getString("code").equals("SACS0000")) { |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("msg")); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("msg")); |
|
|
|
} |
|
|
|
} |
|
|
|
tradeOrderProfitSharing.setStatus(ProfitSharingStatusEnum.status2.getNumber()); |
|
|
|
|
|
|
|
tradeOrderProfitSharingService.editData(tradeOrderProfitSharing); |
|
|
|
|
|
|
|
return responseBody.getJSONObject("resp_data"); |
|
|
|
return responseBody.getJSONObject("resp_data"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -275,19 +277,21 @@ public class LaKaLaTradeSeparateService { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public JSONObject query(String profitSharingOrderNo) { |
|
|
|
public JSONObject query(String profitSharingOrderNo) { |
|
|
|
log.info("========= Start 分账结果查询 Start ==========="); |
|
|
|
log.info("========= Start 分账结果查询 Start ==========="); |
|
|
|
|
|
|
|
/* |
|
|
|
// 交易订单分账
|
|
|
|
// 交易订单分账
|
|
|
|
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo); |
|
|
|
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo); |
|
|
|
if (null == tradeOrderProfitSharing) { |
|
|
|
if (null == tradeOrderProfitSharing) { |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "未找到交易分账记录"); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "未找到交易分账记录"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> commonParam = new HashMap<>(); |
|
|
|
Map<String, Object> commonParam = new HashMap<>(); |
|
|
|
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); |
|
|
|
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss")); |
|
|
|
commonParam.put("version", "3.0"); |
|
|
|
commonParam.put("version", "3.0"); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("merchant_no", tradeOrderProfitSharing.getPlatformMerNo()); |
|
|
|
map.put("merchant_no", "8226410506500HA"); |
|
|
|
map.put("out_separate_no", tradeOrderProfitSharing.getProfitSharingOrderNo()); |
|
|
|
map.put("out_separate_no", "L250806102141542"); |
|
|
|
commonParam.put("req_data", map); |
|
|
|
commonParam.put("req_data", map); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> reqParam = LaKaLaConfig.generateSignParamsV3(JSONObject.parseObject(JSONObject.toJSONString(commonParam))); |
|
|
|
Map<String, Object> reqParam = LaKaLaConfig.generateSignParamsV3(JSONObject.parseObject(JSONObject.toJSONString(commonParam))); |
|
|
|