소스 검색

保存分账订单详情号

liujc 1 년 전
부모
커밋
0f95522c7e

+ 5 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentDivMemberRecord.java

@@ -58,6 +58,11 @@ public class PaymentDivMemberRecord implements Serializable {
 	@TableField(value = "trans_no_")
     private String transNo;
 
+
+    @ApiModelProperty("分账对象")
+    @TableField(value = "div_member_json_")
+    private String divMemberJson;
+
     @ApiModelProperty("分账金额") 
 	@TableField(value = "amount_")
     private BigDecimal amount;

+ 1 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PaymentDivMemberRecordServiceImpl.java

@@ -945,6 +945,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
                 .divOrderNo(divideOrderNo)
                 .transNo(newestPayment != null ? newestPayment.getTransNo() : null)
                 .amount(amount)
+                .divMemberJson(CollectionUtils.isNotEmpty(divide.getDivMembers())?JSON.toJSONString(divide.getDivMembers()):"")
                 .tenantEnterFlag(divide.getStatus()!=null && divide.getStatus().equals(PaymentStatus.SUCCESSED))
                 .status("SUCCESS")
                 .feeFlag(true)

+ 6 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -1376,10 +1376,15 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             .divideBackReason("订单退款")
             .build();
 
+        List<DivideResp.DivMember> divMembers = JSON.parseArray(record.getDivMemberJson(), DivideResp.DivMember.class);
+        if (CollectionUtils.isNotEmpty(divMembers)) {
+            divideBackDetail.setDivideDetailNo(divMembers.get(0).getDetailNo());
+        }
+
         DivideReq.MemberDivideBack memberDivideBack = DivideReq.MemberDivideBack.builder()
             .payerName(EPayerType.YEEPAY.getDesc())
             .memberId(record.getMemberId())
-            .devOrderNo(record.getOrderNo())
+            .devOrderNo(record.getDivOrderNo())
             .platformPayeeMemberId(paymentService.getPaymentConfig().getMerchantId())
             .divideBackOrderNo(divBackRecord.getDivideBackOrderNo())
             .payOrderNo(paymentOrder.getOrderNo())

+ 1 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/PaymentDivMemberRecordMapper.xml

@@ -11,6 +11,7 @@
         , t.order_no_ AS orderNo
         , t.div_order_no_ AS divOrderNo
         , t.trans_no_ AS transNo
+        , t.div_member_json_ AS divMemberJson
         , t.amount_ AS amount
         , t.tenant_enter_flag_ AS tenantEnterFlag
         , t.status_ AS status