Browse Source

订单支付部分付款

chao 3 years ago
parent
commit
b5ef2e62c0

+ 3 - 2
src/main/java/com/caimei365/order/service/impl/PayNonOrderServiceImpl.java

@@ -246,7 +246,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
         log.info("******************** 二手发布支付异步回调 start *******************");
         // 公钥解密
         JSONObject json = PayUtil.publicKeyDecrypt(data, PayUtil.publicKey);
-        log.info("公钥解密>>>>>>" + json);
+        log.info("【二手发布支付异步回调】>>>>>>>>>>>>>>公钥解密:" + json);
         // 公钥验签
         String signaa = json.getString("sign");
         json.remove("sign");
@@ -262,10 +262,11 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
         String attach = json.getString("attach");
         // 订单金额,以元为单位
         BigDecimal amount = json.getBigDecimal("amount");
-        log.info("订单状态>>>>>>" + orderStatus);
+        log.info("【二手发布支付异步回调】>>>>>>>>>>>>>>支付订单状态:" + orderStatus);
         if ("FAILED".equals(orderStatus)) {
             return "支付失败";
         }
+        log.info("【二手发布支付异步回调】>>>>>>>>>>>>>>本次支付金额:" + amount);
         String[] split = attach.split(",");
         // 订单id
         Integer productId = Integer.valueOf(split[0]);

+ 2 - 2
src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -595,7 +595,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         String orderRequestNo = json.getString("orderId");
         // 订单金额,以元为单位
         Double amount = json.getDouble("amount");
-        log.info("订单状态>>>>>>" + orderStatus);
+        log.info("【支付异步回调】>>>>>>>>>>>>>>支付订单状态:" + orderStatus);
         if ("FAILED".equals(orderStatus)) {
             return "支付失败";
         }
@@ -617,7 +617,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 receiptAmount = MathUtil.add(receiptAmount, discernReceipt.getAssociateAmount()).doubleValue();
             }
         }
-        order.setReceiptAmount(receiptAmount);
+        order.setReceiptAmount(MathUtil.add(receiptAmount, amount).doubleValue());
         log.info("【支付异步回调】>>>>>>>>>>>>>>已付金额+本次支付金额:" + order.getReceiptAmount());
         Date date = new Date();
         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);