Authored by LUOXC

refactor

@@ -10,6 +10,11 @@ import java.math.BigDecimal; @@ -10,6 +10,11 @@ import java.math.BigDecimal;
10 @Data 10 @Data
11 public class TradeBills { 11 public class TradeBills {
12 12
  13 + /**
  14 + * 支付宝线下付款(手动打款)
  15 + */
  16 + public static final Integer PAY_TYPE_ALIPAY_OFFLINE_PAYMENT = 102;
  17 +
13 private Integer id; 18 private Integer id;
14 19
15 private Integer uid; 20 private Integer uid;
@@ -19,7 +24,7 @@ public class TradeBills { @@ -19,7 +24,7 @@ public class TradeBills {
19 //1:买家uid; 2:卖家uid 24 //1:买家uid; 2:卖家uid
20 private Integer userType; 25 private Integer userType;
21 26
22 - //1:支付宝; 2:微信 27 + //1:支付宝; 2:微信 102:支付宝线下付款(手动打款)
23 private Integer payType; 28 private Integer payType;
24 29
25 //1:保证金;2:货款;3:补偿款 30 //1:保证金;2:货款;3:补偿款
@@ -1016,7 +1016,8 @@ public class PaymentServiceImpl implements IPaymentService { @@ -1016,7 +1016,8 @@ public class PaymentServiceImpl implements IPaymentService {
1016 throwServiceExceptionIf(!tryLock(logTag, lockKey), 500, "流水已经处理过id=" + tradeBills.getId()); 1016 throwServiceExceptionIf(!tryLock(logTag, lockKey), 500, "流水已经处理过id=" + tradeBills.getId());
1017 1017
1018 // 财务手动标注为已付款 1018 // 财务手动标注为已付款
1019 - if(ManualDealRequest.SCENE_ID_MARK_PAID == req.getSceneId()){ 1019 + if(ManualDealRequest.SCENE_ID_MARK_PAID_ALIPAY_OFFLINE_PAYMENT == req.getSceneId()){
  1020 + tradeBills.setPayType(TradeBills.PAY_TYPE_ALIPAY_OFFLINE_PAYMENT);
1020 markPaid(logTag, tradeBills, lockKey); 1021 markPaid(logTag, tradeBills, lockKey);
1021 } 1022 }
1022 // 退货款或普通用户退保证金 1023 // 退货款或普通用户退保证金