czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
韩鹏辉
2024-01-22 17:26:28 +08:00
parent 4b5761d924
commit ea12afcbdf
9 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pluss-service-bundle/src/main/java/cn/pluss/platform/hf/service/HfPayServiceImpl.java
View File

@@ -315,10 +315,10 @@ public class HfPayServiceImpl implements PayService {
MsgException.check(true, "商户信息不完整");
}
String order_amt = changeY2F(order.getConsumeFee());
Map<String, Object> refundParams = new HashMap<String, Object>();
String refundNo = "adapay_refund_order_" + SnowFlakeUtil.nextId();
refundParams.put("refund_amt", order.getConsumeFee());
String refundNo = "HF_refund_order_" + SnowFlakeUtil.nextId();
refundParams.put("refund_amt", order_amt);
refundParams.put("refund_order_no", refundNo);
refundParams.put("notify_url", callBack);
Map<String, Object> adapay = null;
@@ -328,6 +328,8 @@ public class HfPayServiceImpl implements PayService {
result.put("code", ResultCode.FAIL.code());
try {
init(hfInfo.getLive_api_key(), hfInfo.getTest_api_key(), hfInfo.getPriv_key());
log.info("request:{}",refundParams.toString());
adapay = Refund.create(order.getTransNo(), refundParams);
log.info("payment result=" + JSON.toJSONString(adapay));
if ("pending".equals(adapay.get("status"))) {
@@ -431,7 +433,7 @@ public class HfPayServiceImpl implements PayService {
log.error("====================>【汇付】支付成功回调订单号查询，查询的订单为空：订单号：{}<====================", orderNo);
return YsConfig.RESULT_SUCCESS_CODE;
}
Date payDate = new Date(Long.valueOf(data.get("created_time").toString()) * 1000);
Date payDate = DateUtils.convertDateByString(data.get("created_time").toString());
order.setTransDt(payDate);
order.setTransNo(data.get("id").toString());
order.setThirdTransNo(data.get("id").toString());
@@ -466,6 +468,11 @@ public class HfPayServiceImpl implements PayService {
case "payment.close.failed":
break;
case "refund.succeeded":
break;
case "refund.failed":
break;

8
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
View File

@@ -2170,9 +2170,10 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
@Transactional(rollbackFor = Exception.class,propagation = Propagation.NOT_SUPPORTED)
public void updateOrderAndCreateProfit(MerchantOrder order) {
Integer row = queueDataService.newQueueData(order.getOrderNumber());
log.info("orderNumber:{}",order.getOrderNumber());
if(row > 0){
// 活动营销反积分
setActivityMarketAmt(order,null);
// setActivityMarketAmt(order,null);
// 更新订单状态
updateMerchantOrder(order);
// 推送消息
@@ -2184,11 +2185,11 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
// 发送mqtt消息
rabbitTemplate.convertAndSend("payCallback",JSON.toJSONString(order));
// 更新商品兑换状态
updateGoodExchange(order);
// updateGoodExchange(order);
//订单分账
// merchantOrderSplitService.checkMerchantOrderSplit(order);
// 添加判断BST是否满足条件返积分
userIntegralService.bstOrderIntegralReward(order);
// userIntegralService.bstOrderIntegralReward(order);
try {
MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
@@ -2460,6 +2461,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
}
private void updateMerchantOrder(MerchantOrder order){
log.info("{}更新订单状态",order.getOrderNumber());
if(!"0".equals(order.getStatus())){
order.setStatus("1");
}