diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
index 36b5967a2..ee61a5a26 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
@@ -8,7 +8,9 @@ package com.cool.store.enums.point;
*/
public enum PayTypeEnum {
WX_PAY(1,"微信支付"),
- BANK_PAY(2,"银行转账");
+ BANK_PAY(2,"银行转账"),
+ ONLINE_PAY(3,"线上支付"),
+ OFFLINE_PAY(4,"线下支付");
private Integer code;
private String desc;
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
index 70fc96b96..2d4393148 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
@@ -39,7 +39,7 @@ public enum ShopSubStageStatusEnum {
//缴纳加盟费/保证金
SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待内勤发布账单", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待加盟商缴费", Boolean.FALSE),
- SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待内勤审核", Boolean.FALSE),
+ SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "对账确认中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_73(ShopSubStageEnum.SHOP_STAGE_7, 730, "已缴费", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_74(ShopSubStageEnum.SHOP_STAGE_7, 740, "审核不通过", Boolean.FALSE),
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
index 43bee5bf8..dc6f5fb79 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
@@ -25,11 +25,14 @@
+
+
+
id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time,
- update_time, create_user_id, update_user_id, deleted,pay_business_type,amount,combined_field
+ update_time, create_user_id, update_user_id, deleted,pay_business_type,amount,combined_field,xgj_claim_status,payment_receipt_code,pay_serial_number