From f5830e2ac20281aa6881032ddb86305fadf04ea9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Apr 2021 17:51:53 +0800 Subject: [PATCH 01/14] businessCircle --- .../controller/callback/AliPayController.java | 5 ++-- .../domain/po/AliBusinessCircleOrder.java | 1 + .../AliBusinessCircleOrderService.java | 5 ++-- .../AliBusinessCircleOrderServiceImpl.java | 25 +++++++++++-------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index 08b289153..013c06c33 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -256,7 +256,8 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); - aliBusinessCircleOrderService.createOrder(aliBusinessCircleOrder); + + aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder); return "success"; } //退款成功 @@ -295,7 +296,7 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); - aliBusinessCircleOrderService.insertRefundNoticeOrder(aliBusinessCircleOrder); + aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder); return "success"; } }else{ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java index 566ab8a8d..ea30a7d11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index 777319059..5e6838a5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.WxMerchant; import java.util.List; @@ -35,9 +36,9 @@ public interface AliBusinessCircleOrderService { List getRefundOrderByTransactionId(String transactionId, String tenantId); - void createOrder(AliBusinessCircleOrder record); + void createOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record); - void insertRefundNoticeOrder(AliBusinessCircleOrder record); + void insertRefundNoticeOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record); /** * 积分 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 831726e4a..582ceabdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -82,7 +82,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override - public void createOrder(AliBusinessCircleOrder record) { + public void createOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { String lockKey = StringUtils.join(ALI_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.NO.getCode(),":","lock"); long time = System.currentTimeMillis() + 2000; String timeStr = String.valueOf(time); @@ -99,12 +99,15 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getMallStoreId())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getMallStoreId()); - if(wxMerchant != null){ - record.setMerchantId(wxMerchant.getId()); - }else{ - logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); - } + //必有门店 +// WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getMallStoreId()); +// if(wxMerchant != null){ +// record.setMerchantId(wxMerchant.getId()); +// }else{ +// logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); +// } + record.setMerchantId(wxMerchant.getId()); + AliPayCUser userQ = new AliPayCUser(); userQ.updateTenantInfo(record); userQ.setAlipayUserId(record.getBuyerId()); @@ -140,7 +143,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose("Ali商圈消费:消费商户["+record.getMallName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose("Ali商圈消费:消费商户["+wxMerchant.getName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -169,7 +172,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override - public void insertRefundNoticeOrder(AliBusinessCircleOrder record) { + public void insertRefundNoticeOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { AliBusinessCircleOrder order = this.getOrderByTransactionId(record.getTransactionId(),record.getTenantId()); if(order == null){ logger.error("--Ali商圈退款--付款消息未找到--transactionId="+record.getTransactionId()); @@ -219,7 +222,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setCUserId(record.getCUserId()); creditHistory.setCreateDate(new Date()); creditHistory.setCouponId(record.getId()); - creditHistory.setMerchantId(record.getMerchantId()); + creditHistory.setMerchantId(order.getMerchantId()); creditHistory.setCreditType(EnumScoreType.REFUND_CONSUMPTION.getCode()); int points = 0; if((refundAmount + record.getRefundAmount()) == amount){ @@ -233,7 +236,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose("Ali商圈消费退款:商户["+record.getMallName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose("Ali商圈消费退款:商户["+wxMerchant.getName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { From f1a136ed97ffc60775221e3c41eafcd563e0ef1a Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Apr 2021 18:21:40 +0800 Subject: [PATCH 02/14] businessCircle tran --- .../AliBusinessCircleOrderServiceImpl.java | 76 +++++++++++-------- .../WxBusinessCircleOrderServiceImpl.java | 4 + .../impl/WxThirdPartyOrdersServiceImpl.java | 5 +- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 582ceabdb..d2ac7f4e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -13,6 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Date; @@ -82,6 +84,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void createOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { String lockKey = StringUtils.join(ALI_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.NO.getCode(),":","lock"); long time = System.currentTimeMillis() + 2000; @@ -172,36 +175,43 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void insertRefundNoticeOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { AliBusinessCircleOrder order = this.getOrderByTransactionId(record.getTransactionId(),record.getTenantId()); if(order == null){ logger.error("--Ali商圈退款--付款消息未找到--transactionId="+record.getTransactionId()); }else{ - String lockKey = StringUtils.join(ALI_CIRCLE_KEY,record.getRefundId(), ":",EnumYesOrNo.YES.getCode(),":","lock"); + String lockKey = StringUtils.join(ALI_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.YES.getCode(),":","lock"); long time = System.currentTimeMillis() + 2000; String timeStr = String.valueOf(time); if (redisLock.lock2(lockKey, timeStr)) { - AliBusinessCircleOrder refundOrder = this.getRefundOrderByRefundId(record.getRefundId(),record.getTenantId()); - if(refundOrder != null){ - logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); - }else{ - List refundOrders = this.getRefundOrderByTransactionId(record.getTransactionId(),record.getTenantId()); - Integer amount = order.getPayAmount(); - Integer increasedPoints = order.getIncreasedPoints(); - Integer refundAmount = 0; - Integer refundIncreasedPoints = 0; - - if(refundOrders != null && refundOrders.size()>0){ - for (AliBusinessCircleOrder ro:refundOrders) { - refundAmount += ro.getRefundAmount(); - refundIncreasedPoints += ro.getIncreasedPoints(); - } - } - if(refundAmount >= amount){ - logger.error("--Ali商圈退款--已经退款--transactionId="+record.getTransactionId()); - }else if((refundAmount + record.getRefundAmount()) > amount ){ - logger.error("--Ali商圈退款--退款金额超限--transactionId="+record.getTransactionId()); - }else{ + List refundOrders = this.getRefundOrderByTransactionId(record.getTransactionId(),record.getTenantId()); + if(refundOrders != null && refundOrders.size() > 0){ + logger.error("--Ali商圈退款--已经退款--transactionId="+record.getTransactionId()); + } + +// AliBusinessCircleOrder refundOrder = this.getRefundOrderByRefundId(record.getRefundId(),record.getTenantId()); +// if(refundOrder != null){ +// logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); +// }else{ +// List refundOrders = this.getRefundOrderByTransactionId(record.getTransactionId(),record.getTenantId()); +// Integer amount = order.getPayAmount(); +// Integer increasedPoints = order.getIncreasedPoints(); +// Integer refundAmount = 0; +// Integer refundIncreasedPoints = 0; +// +// if(refundOrders != null && refundOrders.size()>0){ +// for (AliBusinessCircleOrder ro:refundOrders) { +// refundAmount += ro.getRefundAmount(); +// refundIncreasedPoints += ro.getIncreasedPoints(); +// } +// } +// if(refundAmount >= amount){ +// logger.error("--Ali商圈退款--已经退款--transactionId="+record.getTransactionId()); +// }else if((refundAmount + record.getRefundAmount()) > amount ){ +// logger.error("--Ali商圈退款--退款金额超限--transactionId="+record.getTransactionId()); +// } + else{ Date now = new Date(); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -224,16 +234,16 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setCouponId(record.getId()); creditHistory.setMerchantId(order.getMerchantId()); creditHistory.setCreditType(EnumScoreType.REFUND_CONSUMPTION.getCode()); - int points = 0; - if((refundAmount + record.getRefundAmount()) == amount){ - points = increasedPoints - refundIncreasedPoints; - }else{ - points = new BigDecimal(order.getIncreasedPoints()) - .divide(new BigDecimal(order.getPayAmount()),2,BigDecimal.ROUND_HALF_UP) - .multiply(new BigDecimal(record.getRefundAmount())) - .intValue(); - } - +// int points = 0; +// if((refundAmount + record.getRefundAmount()) == amount){ +// points = increasedPoints - refundIncreasedPoints; +// }else{ +// points = new BigDecimal(order.getIncreasedPoints()) +// .divide(new BigDecimal(order.getPayAmount()),2,BigDecimal.ROUND_HALF_UP) +// .multiply(new BigDecimal(record.getRefundAmount())) +// .intValue(); +// } + int points = order.getIncreasedPoints(); creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); creditHistory.setChangePurpose("Ali商圈消费退款:商户["+wxMerchant.getName()+"] ("+record.getRefundAmountStr()+"元) "); @@ -251,7 +261,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder this.updatePoints(record); } } - } +// } redisLock.unlock(lockKey, timeStr); }else{ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index ef254d391..8359f0060 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -13,6 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Date; @@ -82,6 +84,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void createOrder(WxBusinessCircleOrder record) { String lockKey = StringUtils.join(WX_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.NO.getCode(),":", "lock"); long time = System.currentTimeMillis() + 2000; @@ -167,6 +170,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void insertRefundNoticeOrder(WxBusinessCircleOrder record) { WxBusinessCircleOrder order = this.getOrderByTransactionId(record.getTransactionId(),record.getTenantId()); if(order == null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 9a956d457..d76244bb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -15,6 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -90,6 +91,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void createOrder(WxThirdPartyOrders record) { String lockKey = StringUtils.join(THIRD_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.NO.getCode(),":", "lock"); long time = System.currentTimeMillis() + 2000; @@ -178,6 +180,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void insertRefundNoticeOrder(WxThirdPartyOrders record) { WxThirdPartyOrders order = this.getOrderByTransactionId(EnumThirdOrderType.RMB_PAY,record.getTransactionId(),record.getTenantId()); if(order == null){ @@ -284,8 +287,8 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService wxThirdPartyOrdersMapper.updatePoints(record); } - @Transactional(propagation = REQUIRED ,rollbackFor = Exception.class) @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void pointDeduction(WxThirdPartyOrders record) { WxCUserBasicInfo basicInfo = null; From e8880dec8f877ce411eb14fdbd37f92d3a0b10fc Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Apr 2021 18:33:42 +0800 Subject: [PATCH 03/14] businessCircle tran --- .../iformall/controller/callback/AliPayController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index 013c06c33..69588e41d 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -194,13 +194,15 @@ public class AliPayController extends BaseController { @RequestMapping(value = "/notify") public String __Notify(@RequestParam Map paramMap) throws Exception { - logger.info("alipay notify ======{}:"+paramMap); - String msgMethod = (String) paramMap.get("msg_method"); + String notifyId = (String) paramMap.get("notify_id"); if (StringUtils.isBlank(msgMethod)) { logger.error("alipay notify notify error. msg_method empity:"+paramMap); return "fail"; }else { + AliBusinessCircleOrder aliBusinessCircleOrder = new AliBusinessCircleOrder(); + aliBusinessCircleOrder.setNoticeId(notifyId); + aliBusinessCircleOrder.setNoticeEventType(msgMethod); //支付成功 if ("alipay.business.mall.trade.success".equals(msgMethod)) { String bizContent = (String) paramMap.get("biz_content"); @@ -244,7 +246,7 @@ public class AliPayController extends BaseController { logger.error("alipay notify . 找不到门店:"+paramMap); return "fail"; } - AliBusinessCircleOrder aliBusinessCircleOrder = new AliBusinessCircleOrder(); + aliBusinessCircleOrder.updateTenantInfo(merchant); aliBusinessCircleOrder.setTransactionId(tradeNo); aliBusinessCircleOrder.setAmount(amount); @@ -285,7 +287,7 @@ public class AliPayController extends BaseController { logger.error("alipay notify . 找不到门店:"+paramMap); return "fail"; } - AliBusinessCircleOrder aliBusinessCircleOrder = new AliBusinessCircleOrder(); + aliBusinessCircleOrder.updateTenantInfo(merchant); aliBusinessCircleOrder.setTransactionId(tradeNo); aliBusinessCircleOrder.setRefundAmount(refundAmount); From 905c742dd0770f8de9ef2529dc80101551d3cdd6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 14:17:37 +0800 Subject: [PATCH 04/14] businessCircle tran --- .../UserThirdCircleOrderController.java | 63 ++++++++++++------- .../main/java/com/iformall/utils/AppTest.java | 2 +- .../impl/WxThirdPartyOrdersServiceImpl.java | 21 +++++-- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 168f995f3..576dadd28 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -9,6 +9,7 @@ import com.iformall.service.WxThirdPartyOrdersService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -46,27 +47,27 @@ public class UserThirdCircleOrderController extends BaseController { logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString()); String transactionId = (String) map.get("transactionId");//***订单Id - Long shopNumber = (Long) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 + String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 String shopName = (String) map.get("shopName");//门店名称 - Long userNumber = (Long) map.get("userNumber");//***会员Id + String userNumber = (String) map.get("userNumber");//***会员Id String userPhone = (String) map.get("userPhone");//会员手机号 String timeEnd = (String) map.get("timeEnd");//***付款时间(yyyy-MM-dd HH:mm:ss) - Integer amount = (Integer) map.get("amount");//***付款金额(分) + String amount = (String) map.get("amount");//***付款金额(分) String summary = (String) map.get("summary");//付款摘要 if(StringUtils.isBlank(transactionId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); } - if(shopNumber == null){ + if(StringUtils.isBlank(shopNumber)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); } - if(userNumber == null){ + if(StringUtils.isBlank(userNumber)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); } if(StringUtils.isNotBlank(userPhone) && !userPhone.matches("^1[0-9]{10}$")){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"userPhone格式不正确"); } - if(timeEnd == null){ + if(StringUtils.isBlank(timeEnd)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"timeEnd为空"); } Date timeEndDate = null; @@ -75,22 +76,25 @@ public class UserThirdCircleOrderController extends BaseController { } catch (ParseException e) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确"); } - if(amount == null){ + if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } + if(NumberUtils.isCreatable(amount)){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); + } WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.setSourceAppId(getAppId()); thirdPartyOrders.setTransactionId(transactionId); - thirdPartyOrders.setShopNumber(String.valueOf(shopNumber)); + thirdPartyOrders.setShopNumber(shopNumber); thirdPartyOrders.setShopName(shopName); - thirdPartyOrders.setUserNumber(String.valueOf(userNumber)); + thirdPartyOrders.setUserNumber(userNumber); thirdPartyOrders.setUserPhone(userPhone); thirdPartyOrders.setTimeEnd(timeEndDate); - thirdPartyOrders.setAmount(amount); - thirdPartyOrders.setPayAmount(amount); + thirdPartyOrders.setAmount(Integer.parseInt(amount)); + thirdPartyOrders.setPayAmount(Integer.parseInt(amount)); thirdPartyOrders.setSummary(summary); try{ thirdPartyOrdersService.createOrder(thirdPartyOrders); @@ -118,8 +122,8 @@ public class UserThirdCircleOrderController extends BaseController { String transactionId = (String) map.get("transactionId");//***订单Id String refundTime = (String) map.get("refundTime");//***退款时间(yyyy-MM-dd HH:mm:ss) String refundSummary = (String) map.get("refundSummary");//退款摘要 - Integer refundAmount = (Integer) map.get("refundAmount");//退款金额(分) - String refundId = (String) map.get("refundId");//退款Id + String refundAmount = (String) map.get("refundAmount");//退款金额(分) + String refundId = (String) map.get("refundId");//**退款Id if(StringUtils.isBlank(transactionId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); @@ -133,6 +137,13 @@ public class UserThirdCircleOrderController extends BaseController { } catch (ParseException e) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确"); } + if(StringUtils.isNotBlank(refundAmount) && NumberUtils.isCreatable(refundAmount)){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"refundAmount为非数字"); + } + + if(StringUtils.isBlank(refundId)){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"refundId为空"); + } WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); @@ -142,7 +153,7 @@ public class UserThirdCircleOrderController extends BaseController { thirdPartyOrders.setTransactionId(transactionId); thirdPartyOrders.setEndTime(refundTimeDate); thirdPartyOrders.setSummary(refundSummary); - thirdPartyOrders.setRefundAmount(refundAmount); + thirdPartyOrders.setRefundAmount(Integer.parseInt(refundAmount)); thirdPartyOrders.setRefundId(refundId); try{ @@ -170,21 +181,21 @@ public class UserThirdCircleOrderController extends BaseController { logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString()); String transactionId = (String) map.get("transactionId");//***订单Id - Long shopNumber = (Long) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 + String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 String shopName = (String) map.get("shopName");//门店名称 - Long userNumber = (Long) map.get("userNumber");//***会员Id + String userNumber = (String) map.get("userNumber");//***会员Id String userPhone = (String) map.get("userPhone");//会员手机号 String timeEnd = (String) map.get("timeEnd");//***抵扣时间 - Integer amount = (Integer) map.get("amount");//***积分数量 - String summary = (String) map.get("summary");//付款摘要 + String amount = (String) map.get("amount");//***积分数量 + String summary = (String) map.get("summary");//摘要 if(StringUtils.isBlank(transactionId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); } - if(shopNumber == null){ + if(StringUtils.isBlank(shopNumber)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); } - if(userNumber == null){ + if(StringUtils.isBlank(userNumber)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); } if(StringUtils.isNotBlank(userPhone) && !userPhone.matches("^1[0-9]{10}$")){ @@ -199,21 +210,25 @@ public class UserThirdCircleOrderController extends BaseController { } catch (ParseException e) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确"); } - if(amount == null){ + if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } + if(NumberUtils.isCreatable(amount)){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); + } WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.setSourceAppId(getAppId()); thirdPartyOrders.setTransactionId(transactionId); - thirdPartyOrders.setShopNumber(String.valueOf(shopNumber)); + thirdPartyOrders.setShopNumber(shopNumber); thirdPartyOrders.setShopName(shopName); - thirdPartyOrders.setUserNumber(String.valueOf(userNumber)); + thirdPartyOrders.setUserNumber(userNumber); thirdPartyOrders.setUserPhone(userPhone); thirdPartyOrders.setTimeEnd(timeEndDate); - thirdPartyOrders.setAmount(amount); + thirdPartyOrders.setAmount(Integer.parseInt(amount)); + thirdPartyOrders.setPayAmount(Integer.parseInt(amount)); thirdPartyOrders.setSummary(summary); try{ thirdPartyOrdersService.pointDeduction(thirdPartyOrders); diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index d9c12c086..f4b536a39 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -38,7 +38,7 @@ public class AppTest { */ IdWorker idWorker = IdWorker.get(); paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","461675336101793792");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 paramMap.put("shopName","百丽");//门店名称 paramMap.put("userNumber","542490555719278592");//***会员Id paramMap.put("userPhone","18872592633");//会员手机号 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index d76244bb2..d5deab7fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -22,8 +22,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -import static org.springframework.transaction.annotation.Propagation.REQUIRED; - @Service public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService { @@ -120,7 +118,13 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService } WxCUserBasicInfo basicInfo = null; - basicInfo = wxCUserBasicInfoService.getById(Long.parseLong(record.getUserNumber()), record.getFinalTenantId()); + Long userId = null; + try { + userId = Long.parseLong(record.getUserNumber()); + } catch (NumberFormatException e) {} + if(userId != null){ + basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); + } if(basicInfo == null){ basicInfo = wxCUserBasicInfoService.registerByPhone(record, record.getUserPhone()); } @@ -207,6 +211,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService refundIncreasedPoints += ro.getIncreasedPoints(); } } + if(record.getRefundAmount() == null){ + record.setRefundAmount(order.getPayAmount()-refundAmount); + } if(refundAmount >= amount){ logger.error("--第三方退款--已经退款--transactionId="+record.getTransactionId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "已经退款"); @@ -292,8 +299,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService public void pointDeduction(WxThirdPartyOrders record) { WxCUserBasicInfo basicInfo = null; - if(StringUtils.isNotBlank(record.getUserNumber())){ - basicInfo = wxCUserBasicInfoService.getById(Long.parseLong(record.getUserNumber()), record.getFinalTenantId()); + Long userId = null; + try { + userId = Long.parseLong(record.getUserNumber()); + } catch (NumberFormatException e) {} + if(userId != null){ + basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); } if(basicInfo == null){ logger.error("--第三方积分订单--未找到用户---userId="+record.getUserNumber()); From eac2438dc7e8ca042aea1f52a27d4698b8565292 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 15:47:42 +0800 Subject: [PATCH 05/14] businessCircle tran --- ...202104190001__wx_business_circle_order.sql | 400 +++++++++--------- ...02104280001__ali_business_circle_order.sql | 400 +++++++++--------- .../V202104280002__third_party_orderss.sql | 400 +++++++++--------- .../callback/WxBusinessOrderController.java | 1 - .../domain/po/BusinessCircleBase.java | 6 +- .../mapper/AliBusinessCircleOrderMapper.java | 6 + .../mapper/WxBusinessCircleOrderMapper.java | 6 + .../mapper/WxThirdPartyOrdersMapper.java | 6 + .../AliBusinessCircleOrderServiceImpl.java | 4 + .../WxBusinessCircleOrderServiceImpl.java | 8 + .../impl/WxThirdPartyOrdersServiceImpl.java | 8 + .../mapper/AliBusinessCircleOrderMapper.xml | 43 +- .../mapper/WxBusinessCircleOrderMapper.xml | 25 +- .../mapper/WxThirdPartyOrdersMapper.xml | 27 +- 14 files changed, 705 insertions(+), 635 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104190001__wx_business_circle_order.sql b/mallinkAdmin/src/main/resources/db/migration/V202104190001__wx_business_circle_order.sql index 27cb21ccf..4d1e3c939 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104190001__wx_business_circle_order.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104190001__wx_business_circle_order.sql @@ -5,7 +5,6 @@ CREATE TABLE `wx_business_circle_order_0` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -26,7 +25,8 @@ CREATE TABLE `wx_business_circle_order_0` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -43,7 +43,6 @@ CREATE TABLE `wx_business_circle_order_1` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -64,7 +63,8 @@ CREATE TABLE `wx_business_circle_order_1` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -81,7 +81,6 @@ CREATE TABLE `wx_business_circle_order_2` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -102,7 +101,8 @@ CREATE TABLE `wx_business_circle_order_2` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -119,7 +119,6 @@ CREATE TABLE `wx_business_circle_order_3` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -140,7 +139,8 @@ CREATE TABLE `wx_business_circle_order_3` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -157,7 +157,6 @@ CREATE TABLE `wx_business_circle_order_4` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -178,7 +177,8 @@ CREATE TABLE `wx_business_circle_order_4` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -195,7 +195,6 @@ CREATE TABLE `wx_business_circle_order_5` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -216,7 +215,8 @@ CREATE TABLE `wx_business_circle_order_5` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -233,7 +233,6 @@ CREATE TABLE `wx_business_circle_order_6` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -254,7 +253,8 @@ CREATE TABLE `wx_business_circle_order_6` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -271,7 +271,6 @@ CREATE TABLE `wx_business_circle_order_7` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -292,7 +291,8 @@ CREATE TABLE `wx_business_circle_order_7` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -309,7 +309,6 @@ CREATE TABLE `wx_business_circle_order_8` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -330,7 +329,8 @@ CREATE TABLE `wx_business_circle_order_8` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -347,7 +347,6 @@ CREATE TABLE `wx_business_circle_order_9` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -368,7 +367,8 @@ CREATE TABLE `wx_business_circle_order_9` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -385,7 +385,6 @@ CREATE TABLE `wx_business_circle_order_10` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -406,7 +405,8 @@ CREATE TABLE `wx_business_circle_order_10` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -423,7 +423,6 @@ CREATE TABLE `wx_business_circle_order_11` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -444,7 +443,8 @@ CREATE TABLE `wx_business_circle_order_11` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -461,7 +461,6 @@ CREATE TABLE `wx_business_circle_order_12` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -482,7 +481,8 @@ CREATE TABLE `wx_business_circle_order_12` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -499,7 +499,6 @@ CREATE TABLE `wx_business_circle_order_13` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -520,7 +519,8 @@ CREATE TABLE `wx_business_circle_order_13` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -537,7 +537,6 @@ CREATE TABLE `wx_business_circle_order_14` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -558,7 +557,8 @@ CREATE TABLE `wx_business_circle_order_14` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -575,7 +575,6 @@ CREATE TABLE `wx_business_circle_order_15` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -596,7 +595,8 @@ CREATE TABLE `wx_business_circle_order_15` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -613,7 +613,6 @@ CREATE TABLE `wx_business_circle_order_16` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -634,7 +633,8 @@ CREATE TABLE `wx_business_circle_order_16` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -651,7 +651,6 @@ CREATE TABLE `wx_business_circle_order_17` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -672,7 +671,8 @@ CREATE TABLE `wx_business_circle_order_17` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -689,7 +689,6 @@ CREATE TABLE `wx_business_circle_order_18` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -710,7 +709,8 @@ CREATE TABLE `wx_business_circle_order_18` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -727,7 +727,6 @@ CREATE TABLE `wx_business_circle_order_19` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -748,7 +747,8 @@ CREATE TABLE `wx_business_circle_order_19` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -765,7 +765,6 @@ CREATE TABLE `wx_business_circle_order_20` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -786,7 +785,8 @@ CREATE TABLE `wx_business_circle_order_20` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -803,7 +803,6 @@ CREATE TABLE `wx_business_circle_order_21` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -824,7 +823,8 @@ CREATE TABLE `wx_business_circle_order_21` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -841,7 +841,6 @@ CREATE TABLE `wx_business_circle_order_22` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -862,7 +861,8 @@ CREATE TABLE `wx_business_circle_order_22` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -879,7 +879,6 @@ CREATE TABLE `wx_business_circle_order_23` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -900,7 +899,8 @@ CREATE TABLE `wx_business_circle_order_23` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -917,7 +917,6 @@ CREATE TABLE `wx_business_circle_order_24` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -938,7 +937,8 @@ CREATE TABLE `wx_business_circle_order_24` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -955,7 +955,6 @@ CREATE TABLE `wx_business_circle_order_25` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -976,7 +975,8 @@ CREATE TABLE `wx_business_circle_order_25` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -993,7 +993,6 @@ CREATE TABLE `wx_business_circle_order_26` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1014,7 +1013,8 @@ CREATE TABLE `wx_business_circle_order_26` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1031,7 +1031,6 @@ CREATE TABLE `wx_business_circle_order_27` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1052,7 +1051,8 @@ CREATE TABLE `wx_business_circle_order_27` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1069,7 +1069,6 @@ CREATE TABLE `wx_business_circle_order_28` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1090,7 +1089,8 @@ CREATE TABLE `wx_business_circle_order_28` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1107,7 +1107,6 @@ CREATE TABLE `wx_business_circle_order_29` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1128,7 +1127,8 @@ CREATE TABLE `wx_business_circle_order_29` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1145,7 +1145,6 @@ CREATE TABLE `wx_business_circle_order_30` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1166,7 +1165,8 @@ CREATE TABLE `wx_business_circle_order_30` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1183,7 +1183,6 @@ CREATE TABLE `wx_business_circle_order_31` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1204,7 +1203,8 @@ CREATE TABLE `wx_business_circle_order_31` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1221,7 +1221,6 @@ CREATE TABLE `wx_business_circle_order_32` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1242,7 +1241,8 @@ CREATE TABLE `wx_business_circle_order_32` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1259,7 +1259,6 @@ CREATE TABLE `wx_business_circle_order_33` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1280,7 +1279,8 @@ CREATE TABLE `wx_business_circle_order_33` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1297,7 +1297,6 @@ CREATE TABLE `wx_business_circle_order_34` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1318,7 +1317,8 @@ CREATE TABLE `wx_business_circle_order_34` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1335,7 +1335,6 @@ CREATE TABLE `wx_business_circle_order_35` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1356,7 +1355,8 @@ CREATE TABLE `wx_business_circle_order_35` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1373,7 +1373,6 @@ CREATE TABLE `wx_business_circle_order_36` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1394,7 +1393,8 @@ CREATE TABLE `wx_business_circle_order_36` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1411,7 +1411,6 @@ CREATE TABLE `wx_business_circle_order_37` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1432,7 +1431,8 @@ CREATE TABLE `wx_business_circle_order_37` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1449,7 +1449,6 @@ CREATE TABLE `wx_business_circle_order_38` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1470,7 +1469,8 @@ CREATE TABLE `wx_business_circle_order_38` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1487,7 +1487,6 @@ CREATE TABLE `wx_business_circle_order_39` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1508,7 +1507,8 @@ CREATE TABLE `wx_business_circle_order_39` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1525,7 +1525,6 @@ CREATE TABLE `wx_business_circle_order_40` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1546,7 +1545,8 @@ CREATE TABLE `wx_business_circle_order_40` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1563,7 +1563,6 @@ CREATE TABLE `wx_business_circle_order_41` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1584,7 +1583,8 @@ CREATE TABLE `wx_business_circle_order_41` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1601,7 +1601,6 @@ CREATE TABLE `wx_business_circle_order_42` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1622,7 +1621,8 @@ CREATE TABLE `wx_business_circle_order_42` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1639,7 +1639,6 @@ CREATE TABLE `wx_business_circle_order_43` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1660,7 +1659,8 @@ CREATE TABLE `wx_business_circle_order_43` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1677,7 +1677,6 @@ CREATE TABLE `wx_business_circle_order_44` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1698,7 +1697,8 @@ CREATE TABLE `wx_business_circle_order_44` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1715,7 +1715,6 @@ CREATE TABLE `wx_business_circle_order_45` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1736,7 +1735,8 @@ CREATE TABLE `wx_business_circle_order_45` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1753,7 +1753,6 @@ CREATE TABLE `wx_business_circle_order_46` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1774,7 +1773,8 @@ CREATE TABLE `wx_business_circle_order_46` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1791,7 +1791,6 @@ CREATE TABLE `wx_business_circle_order_47` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1812,7 +1811,8 @@ CREATE TABLE `wx_business_circle_order_47` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1829,7 +1829,6 @@ CREATE TABLE `wx_business_circle_order_48` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1850,7 +1849,8 @@ CREATE TABLE `wx_business_circle_order_48` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1867,7 +1867,6 @@ CREATE TABLE `wx_business_circle_order_49` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1888,7 +1887,8 @@ CREATE TABLE `wx_business_circle_order_49` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1905,7 +1905,6 @@ CREATE TABLE `wx_business_circle_order_50` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1926,7 +1925,8 @@ CREATE TABLE `wx_business_circle_order_50` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1943,7 +1943,6 @@ CREATE TABLE `wx_business_circle_order_51` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -1964,7 +1963,8 @@ CREATE TABLE `wx_business_circle_order_51` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1981,7 +1981,6 @@ CREATE TABLE `wx_business_circle_order_52` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2002,7 +2001,8 @@ CREATE TABLE `wx_business_circle_order_52` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2019,7 +2019,6 @@ CREATE TABLE `wx_business_circle_order_53` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2040,7 +2039,8 @@ CREATE TABLE `wx_business_circle_order_53` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2057,7 +2057,6 @@ CREATE TABLE `wx_business_circle_order_54` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2078,7 +2077,8 @@ CREATE TABLE `wx_business_circle_order_54` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2095,7 +2095,6 @@ CREATE TABLE `wx_business_circle_order_55` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2116,7 +2115,8 @@ CREATE TABLE `wx_business_circle_order_55` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2133,7 +2133,6 @@ CREATE TABLE `wx_business_circle_order_56` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2154,7 +2153,8 @@ CREATE TABLE `wx_business_circle_order_56` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2171,7 +2171,6 @@ CREATE TABLE `wx_business_circle_order_57` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2192,7 +2191,8 @@ CREATE TABLE `wx_business_circle_order_57` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2209,7 +2209,6 @@ CREATE TABLE `wx_business_circle_order_58` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2230,7 +2229,8 @@ CREATE TABLE `wx_business_circle_order_58` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2247,7 +2247,6 @@ CREATE TABLE `wx_business_circle_order_59` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2268,7 +2267,8 @@ CREATE TABLE `wx_business_circle_order_59` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2285,7 +2285,6 @@ CREATE TABLE `wx_business_circle_order_60` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2306,7 +2305,8 @@ CREATE TABLE `wx_business_circle_order_60` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2323,7 +2323,6 @@ CREATE TABLE `wx_business_circle_order_61` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2344,7 +2343,8 @@ CREATE TABLE `wx_business_circle_order_61` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2361,7 +2361,6 @@ CREATE TABLE `wx_business_circle_order_62` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2382,7 +2381,8 @@ CREATE TABLE `wx_business_circle_order_62` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2399,7 +2399,6 @@ CREATE TABLE `wx_business_circle_order_63` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2420,7 +2419,8 @@ CREATE TABLE `wx_business_circle_order_63` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2437,7 +2437,6 @@ CREATE TABLE `wx_business_circle_order_64` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2458,7 +2457,8 @@ CREATE TABLE `wx_business_circle_order_64` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2475,7 +2475,6 @@ CREATE TABLE `wx_business_circle_order_65` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2496,7 +2495,8 @@ CREATE TABLE `wx_business_circle_order_65` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2513,7 +2513,6 @@ CREATE TABLE `wx_business_circle_order_66` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2534,7 +2533,8 @@ CREATE TABLE `wx_business_circle_order_66` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2551,7 +2551,6 @@ CREATE TABLE `wx_business_circle_order_67` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2572,7 +2571,8 @@ CREATE TABLE `wx_business_circle_order_67` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2589,7 +2589,6 @@ CREATE TABLE `wx_business_circle_order_68` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2610,7 +2609,8 @@ CREATE TABLE `wx_business_circle_order_68` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2627,7 +2627,6 @@ CREATE TABLE `wx_business_circle_order_69` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2648,7 +2647,8 @@ CREATE TABLE `wx_business_circle_order_69` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2665,7 +2665,6 @@ CREATE TABLE `wx_business_circle_order_70` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2686,7 +2685,8 @@ CREATE TABLE `wx_business_circle_order_70` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2703,7 +2703,6 @@ CREATE TABLE `wx_business_circle_order_71` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2724,7 +2723,8 @@ CREATE TABLE `wx_business_circle_order_71` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2741,7 +2741,6 @@ CREATE TABLE `wx_business_circle_order_72` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2762,7 +2761,8 @@ CREATE TABLE `wx_business_circle_order_72` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2779,7 +2779,6 @@ CREATE TABLE `wx_business_circle_order_73` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2800,7 +2799,8 @@ CREATE TABLE `wx_business_circle_order_73` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2817,7 +2817,6 @@ CREATE TABLE `wx_business_circle_order_74` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2838,7 +2837,8 @@ CREATE TABLE `wx_business_circle_order_74` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2855,7 +2855,6 @@ CREATE TABLE `wx_business_circle_order_75` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2876,7 +2875,8 @@ CREATE TABLE `wx_business_circle_order_75` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2893,7 +2893,6 @@ CREATE TABLE `wx_business_circle_order_76` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2914,7 +2913,8 @@ CREATE TABLE `wx_business_circle_order_76` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2931,7 +2931,6 @@ CREATE TABLE `wx_business_circle_order_77` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2952,7 +2951,8 @@ CREATE TABLE `wx_business_circle_order_77` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2969,7 +2969,6 @@ CREATE TABLE `wx_business_circle_order_78` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -2990,7 +2989,8 @@ CREATE TABLE `wx_business_circle_order_78` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3007,7 +3007,6 @@ CREATE TABLE `wx_business_circle_order_79` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3028,7 +3027,8 @@ CREATE TABLE `wx_business_circle_order_79` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3045,7 +3045,6 @@ CREATE TABLE `wx_business_circle_order_80` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3066,7 +3065,8 @@ CREATE TABLE `wx_business_circle_order_80` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3083,7 +3083,6 @@ CREATE TABLE `wx_business_circle_order_81` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3104,7 +3103,8 @@ CREATE TABLE `wx_business_circle_order_81` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3121,7 +3121,6 @@ CREATE TABLE `wx_business_circle_order_82` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3142,7 +3141,8 @@ CREATE TABLE `wx_business_circle_order_82` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3159,7 +3159,6 @@ CREATE TABLE `wx_business_circle_order_83` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3180,7 +3179,8 @@ CREATE TABLE `wx_business_circle_order_83` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3197,7 +3197,6 @@ CREATE TABLE `wx_business_circle_order_84` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3218,7 +3217,8 @@ CREATE TABLE `wx_business_circle_order_84` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3235,7 +3235,6 @@ CREATE TABLE `wx_business_circle_order_85` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3256,7 +3255,8 @@ CREATE TABLE `wx_business_circle_order_85` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3273,7 +3273,6 @@ CREATE TABLE `wx_business_circle_order_86` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3294,7 +3293,8 @@ CREATE TABLE `wx_business_circle_order_86` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3311,7 +3311,6 @@ CREATE TABLE `wx_business_circle_order_87` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3332,7 +3331,8 @@ CREATE TABLE `wx_business_circle_order_87` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3349,7 +3349,6 @@ CREATE TABLE `wx_business_circle_order_88` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3370,7 +3369,8 @@ CREATE TABLE `wx_business_circle_order_88` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3387,7 +3387,6 @@ CREATE TABLE `wx_business_circle_order_89` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3408,7 +3407,8 @@ CREATE TABLE `wx_business_circle_order_89` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3425,7 +3425,6 @@ CREATE TABLE `wx_business_circle_order_90` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3446,7 +3445,8 @@ CREATE TABLE `wx_business_circle_order_90` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3463,7 +3463,6 @@ CREATE TABLE `wx_business_circle_order_91` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3484,7 +3483,8 @@ CREATE TABLE `wx_business_circle_order_91` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3501,7 +3501,6 @@ CREATE TABLE `wx_business_circle_order_92` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3522,7 +3521,8 @@ CREATE TABLE `wx_business_circle_order_92` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3539,7 +3539,6 @@ CREATE TABLE `wx_business_circle_order_93` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3560,7 +3559,8 @@ CREATE TABLE `wx_business_circle_order_93` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3577,7 +3577,6 @@ CREATE TABLE `wx_business_circle_order_94` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3598,7 +3597,8 @@ CREATE TABLE `wx_business_circle_order_94` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3615,7 +3615,6 @@ CREATE TABLE `wx_business_circle_order_95` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3636,7 +3635,8 @@ CREATE TABLE `wx_business_circle_order_95` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3653,7 +3653,6 @@ CREATE TABLE `wx_business_circle_order_96` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3674,7 +3673,8 @@ CREATE TABLE `wx_business_circle_order_96` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3691,7 +3691,6 @@ CREATE TABLE `wx_business_circle_order_97` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3712,7 +3711,8 @@ CREATE TABLE `wx_business_circle_order_97` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3729,7 +3729,6 @@ CREATE TABLE `wx_business_circle_order_98` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3750,7 +3749,8 @@ CREATE TABLE `wx_business_circle_order_98` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3767,7 +3767,6 @@ CREATE TABLE `wx_business_circle_order_99` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `wx_mchid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付分配的商户号', `wx_merchant_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商圈商户名称', @@ -3788,7 +3787,8 @@ CREATE TABLE `wx_business_circle_order_99` ( `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', `is_points_notify` tinyint(1) DEFAULT NULL COMMENT '是否积分同步(1:是,0:否)', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104280001__ali_business_circle_order.sql b/mallinkAdmin/src/main/resources/db/migration/V202104280001__ali_business_circle_order.sql index 4f067a43a..bc17bd21f 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104280001__ali_business_circle_order.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104280001__ali_business_circle_order.sql @@ -5,7 +5,6 @@ CREATE TABLE `ali_business_circle_order_0` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -22,7 +21,8 @@ CREATE TABLE `ali_business_circle_order_0` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -39,7 +39,6 @@ CREATE TABLE `ali_business_circle_order_1` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -56,7 +55,8 @@ CREATE TABLE `ali_business_circle_order_1` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -73,7 +73,6 @@ CREATE TABLE `ali_business_circle_order_2` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -90,7 +89,8 @@ CREATE TABLE `ali_business_circle_order_2` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -107,7 +107,6 @@ CREATE TABLE `ali_business_circle_order_3` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -124,7 +123,8 @@ CREATE TABLE `ali_business_circle_order_3` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -141,7 +141,6 @@ CREATE TABLE `ali_business_circle_order_4` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -158,7 +157,8 @@ CREATE TABLE `ali_business_circle_order_4` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -175,7 +175,6 @@ CREATE TABLE `ali_business_circle_order_5` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -192,7 +191,8 @@ CREATE TABLE `ali_business_circle_order_5` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -209,7 +209,6 @@ CREATE TABLE `ali_business_circle_order_6` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -226,7 +225,8 @@ CREATE TABLE `ali_business_circle_order_6` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -243,7 +243,6 @@ CREATE TABLE `ali_business_circle_order_7` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -260,7 +259,8 @@ CREATE TABLE `ali_business_circle_order_7` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -277,7 +277,6 @@ CREATE TABLE `ali_business_circle_order_8` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -294,7 +293,8 @@ CREATE TABLE `ali_business_circle_order_8` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -311,7 +311,6 @@ CREATE TABLE `ali_business_circle_order_9` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -328,7 +327,8 @@ CREATE TABLE `ali_business_circle_order_9` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -345,7 +345,6 @@ CREATE TABLE `ali_business_circle_order_10` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -362,7 +361,8 @@ CREATE TABLE `ali_business_circle_order_10` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -379,7 +379,6 @@ CREATE TABLE `ali_business_circle_order_11` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -396,7 +395,8 @@ CREATE TABLE `ali_business_circle_order_11` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -413,7 +413,6 @@ CREATE TABLE `ali_business_circle_order_12` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -430,7 +429,8 @@ CREATE TABLE `ali_business_circle_order_12` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -447,7 +447,6 @@ CREATE TABLE `ali_business_circle_order_13` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -464,7 +463,8 @@ CREATE TABLE `ali_business_circle_order_13` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -481,7 +481,6 @@ CREATE TABLE `ali_business_circle_order_14` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -498,7 +497,8 @@ CREATE TABLE `ali_business_circle_order_14` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -515,7 +515,6 @@ CREATE TABLE `ali_business_circle_order_15` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -532,7 +531,8 @@ CREATE TABLE `ali_business_circle_order_15` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -549,7 +549,6 @@ CREATE TABLE `ali_business_circle_order_16` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -566,7 +565,8 @@ CREATE TABLE `ali_business_circle_order_16` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -583,7 +583,6 @@ CREATE TABLE `ali_business_circle_order_17` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -600,7 +599,8 @@ CREATE TABLE `ali_business_circle_order_17` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -617,7 +617,6 @@ CREATE TABLE `ali_business_circle_order_18` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -634,7 +633,8 @@ CREATE TABLE `ali_business_circle_order_18` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -651,7 +651,6 @@ CREATE TABLE `ali_business_circle_order_19` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -668,7 +667,8 @@ CREATE TABLE `ali_business_circle_order_19` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -685,7 +685,6 @@ CREATE TABLE `ali_business_circle_order_20` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -702,7 +701,8 @@ CREATE TABLE `ali_business_circle_order_20` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -719,7 +719,6 @@ CREATE TABLE `ali_business_circle_order_21` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -736,7 +735,8 @@ CREATE TABLE `ali_business_circle_order_21` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -753,7 +753,6 @@ CREATE TABLE `ali_business_circle_order_22` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -770,7 +769,8 @@ CREATE TABLE `ali_business_circle_order_22` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -787,7 +787,6 @@ CREATE TABLE `ali_business_circle_order_23` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -804,7 +803,8 @@ CREATE TABLE `ali_business_circle_order_23` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -821,7 +821,6 @@ CREATE TABLE `ali_business_circle_order_24` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -838,7 +837,8 @@ CREATE TABLE `ali_business_circle_order_24` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -855,7 +855,6 @@ CREATE TABLE `ali_business_circle_order_25` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -872,7 +871,8 @@ CREATE TABLE `ali_business_circle_order_25` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -889,7 +889,6 @@ CREATE TABLE `ali_business_circle_order_26` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -906,7 +905,8 @@ CREATE TABLE `ali_business_circle_order_26` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -923,7 +923,6 @@ CREATE TABLE `ali_business_circle_order_27` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -940,7 +939,8 @@ CREATE TABLE `ali_business_circle_order_27` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -957,7 +957,6 @@ CREATE TABLE `ali_business_circle_order_28` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -974,7 +973,8 @@ CREATE TABLE `ali_business_circle_order_28` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -991,7 +991,6 @@ CREATE TABLE `ali_business_circle_order_29` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1008,7 +1007,8 @@ CREATE TABLE `ali_business_circle_order_29` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1025,7 +1025,6 @@ CREATE TABLE `ali_business_circle_order_30` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1042,7 +1041,8 @@ CREATE TABLE `ali_business_circle_order_30` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1059,7 +1059,6 @@ CREATE TABLE `ali_business_circle_order_31` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1076,7 +1075,8 @@ CREATE TABLE `ali_business_circle_order_31` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1093,7 +1093,6 @@ CREATE TABLE `ali_business_circle_order_32` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1110,7 +1109,8 @@ CREATE TABLE `ali_business_circle_order_32` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1127,7 +1127,6 @@ CREATE TABLE `ali_business_circle_order_33` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1144,7 +1143,8 @@ CREATE TABLE `ali_business_circle_order_33` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1161,7 +1161,6 @@ CREATE TABLE `ali_business_circle_order_34` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1178,7 +1177,8 @@ CREATE TABLE `ali_business_circle_order_34` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1195,7 +1195,6 @@ CREATE TABLE `ali_business_circle_order_35` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1212,7 +1211,8 @@ CREATE TABLE `ali_business_circle_order_35` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1229,7 +1229,6 @@ CREATE TABLE `ali_business_circle_order_36` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1246,7 +1245,8 @@ CREATE TABLE `ali_business_circle_order_36` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1263,7 +1263,6 @@ CREATE TABLE `ali_business_circle_order_37` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1280,7 +1279,8 @@ CREATE TABLE `ali_business_circle_order_37` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1297,7 +1297,6 @@ CREATE TABLE `ali_business_circle_order_38` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1314,7 +1313,8 @@ CREATE TABLE `ali_business_circle_order_38` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1331,7 +1331,6 @@ CREATE TABLE `ali_business_circle_order_39` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1348,7 +1347,8 @@ CREATE TABLE `ali_business_circle_order_39` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1365,7 +1365,6 @@ CREATE TABLE `ali_business_circle_order_40` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1382,7 +1381,8 @@ CREATE TABLE `ali_business_circle_order_40` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1399,7 +1399,6 @@ CREATE TABLE `ali_business_circle_order_41` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1416,7 +1415,8 @@ CREATE TABLE `ali_business_circle_order_41` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1433,7 +1433,6 @@ CREATE TABLE `ali_business_circle_order_42` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1450,7 +1449,8 @@ CREATE TABLE `ali_business_circle_order_42` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1467,7 +1467,6 @@ CREATE TABLE `ali_business_circle_order_43` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1484,7 +1483,8 @@ CREATE TABLE `ali_business_circle_order_43` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1501,7 +1501,6 @@ CREATE TABLE `ali_business_circle_order_44` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1518,7 +1517,8 @@ CREATE TABLE `ali_business_circle_order_44` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1535,7 +1535,6 @@ CREATE TABLE `ali_business_circle_order_45` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1552,7 +1551,8 @@ CREATE TABLE `ali_business_circle_order_45` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1569,7 +1569,6 @@ CREATE TABLE `ali_business_circle_order_46` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1586,7 +1585,8 @@ CREATE TABLE `ali_business_circle_order_46` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1603,7 +1603,6 @@ CREATE TABLE `ali_business_circle_order_47` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1620,7 +1619,8 @@ CREATE TABLE `ali_business_circle_order_47` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1637,7 +1637,6 @@ CREATE TABLE `ali_business_circle_order_48` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1654,7 +1653,8 @@ CREATE TABLE `ali_business_circle_order_48` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1671,7 +1671,6 @@ CREATE TABLE `ali_business_circle_order_49` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1688,7 +1687,8 @@ CREATE TABLE `ali_business_circle_order_49` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1705,7 +1705,6 @@ CREATE TABLE `ali_business_circle_order_50` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1722,7 +1721,8 @@ CREATE TABLE `ali_business_circle_order_50` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1739,7 +1739,6 @@ CREATE TABLE `ali_business_circle_order_51` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1756,7 +1755,8 @@ CREATE TABLE `ali_business_circle_order_51` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1773,7 +1773,6 @@ CREATE TABLE `ali_business_circle_order_52` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1790,7 +1789,8 @@ CREATE TABLE `ali_business_circle_order_52` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1807,7 +1807,6 @@ CREATE TABLE `ali_business_circle_order_53` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1824,7 +1823,8 @@ CREATE TABLE `ali_business_circle_order_53` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1841,7 +1841,6 @@ CREATE TABLE `ali_business_circle_order_54` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1858,7 +1857,8 @@ CREATE TABLE `ali_business_circle_order_54` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1875,7 +1875,6 @@ CREATE TABLE `ali_business_circle_order_55` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1892,7 +1891,8 @@ CREATE TABLE `ali_business_circle_order_55` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1909,7 +1909,6 @@ CREATE TABLE `ali_business_circle_order_56` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1926,7 +1925,8 @@ CREATE TABLE `ali_business_circle_order_56` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1943,7 +1943,6 @@ CREATE TABLE `ali_business_circle_order_57` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1960,7 +1959,8 @@ CREATE TABLE `ali_business_circle_order_57` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1977,7 +1977,6 @@ CREATE TABLE `ali_business_circle_order_58` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -1994,7 +1993,8 @@ CREATE TABLE `ali_business_circle_order_58` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2011,7 +2011,6 @@ CREATE TABLE `ali_business_circle_order_59` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2028,7 +2027,8 @@ CREATE TABLE `ali_business_circle_order_59` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2045,7 +2045,6 @@ CREATE TABLE `ali_business_circle_order_60` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2062,7 +2061,8 @@ CREATE TABLE `ali_business_circle_order_60` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2079,7 +2079,6 @@ CREATE TABLE `ali_business_circle_order_61` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2096,7 +2095,8 @@ CREATE TABLE `ali_business_circle_order_61` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2113,7 +2113,6 @@ CREATE TABLE `ali_business_circle_order_62` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2130,7 +2129,8 @@ CREATE TABLE `ali_business_circle_order_62` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2147,7 +2147,6 @@ CREATE TABLE `ali_business_circle_order_63` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2164,7 +2163,8 @@ CREATE TABLE `ali_business_circle_order_63` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2181,7 +2181,6 @@ CREATE TABLE `ali_business_circle_order_64` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2198,7 +2197,8 @@ CREATE TABLE `ali_business_circle_order_64` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2215,7 +2215,6 @@ CREATE TABLE `ali_business_circle_order_65` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2232,7 +2231,8 @@ CREATE TABLE `ali_business_circle_order_65` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2249,7 +2249,6 @@ CREATE TABLE `ali_business_circle_order_66` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2266,7 +2265,8 @@ CREATE TABLE `ali_business_circle_order_66` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2283,7 +2283,6 @@ CREATE TABLE `ali_business_circle_order_67` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2300,7 +2299,8 @@ CREATE TABLE `ali_business_circle_order_67` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2317,7 +2317,6 @@ CREATE TABLE `ali_business_circle_order_68` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2334,7 +2333,8 @@ CREATE TABLE `ali_business_circle_order_68` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2351,7 +2351,6 @@ CREATE TABLE `ali_business_circle_order_69` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2368,7 +2367,8 @@ CREATE TABLE `ali_business_circle_order_69` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2385,7 +2385,6 @@ CREATE TABLE `ali_business_circle_order_70` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2402,7 +2401,8 @@ CREATE TABLE `ali_business_circle_order_70` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2419,7 +2419,6 @@ CREATE TABLE `ali_business_circle_order_71` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2436,7 +2435,8 @@ CREATE TABLE `ali_business_circle_order_71` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2453,7 +2453,6 @@ CREATE TABLE `ali_business_circle_order_72` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2470,7 +2469,8 @@ CREATE TABLE `ali_business_circle_order_72` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2487,7 +2487,6 @@ CREATE TABLE `ali_business_circle_order_73` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2504,7 +2503,8 @@ CREATE TABLE `ali_business_circle_order_73` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2521,7 +2521,6 @@ CREATE TABLE `ali_business_circle_order_74` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2538,7 +2537,8 @@ CREATE TABLE `ali_business_circle_order_74` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2555,7 +2555,6 @@ CREATE TABLE `ali_business_circle_order_75` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2572,7 +2571,8 @@ CREATE TABLE `ali_business_circle_order_75` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2589,7 +2589,6 @@ CREATE TABLE `ali_business_circle_order_76` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2606,7 +2605,8 @@ CREATE TABLE `ali_business_circle_order_76` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2623,7 +2623,6 @@ CREATE TABLE `ali_business_circle_order_77` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2640,7 +2639,8 @@ CREATE TABLE `ali_business_circle_order_77` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2657,7 +2657,6 @@ CREATE TABLE `ali_business_circle_order_78` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2674,7 +2673,8 @@ CREATE TABLE `ali_business_circle_order_78` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2691,7 +2691,6 @@ CREATE TABLE `ali_business_circle_order_79` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2708,7 +2707,8 @@ CREATE TABLE `ali_business_circle_order_79` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2725,7 +2725,6 @@ CREATE TABLE `ali_business_circle_order_80` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2742,7 +2741,8 @@ CREATE TABLE `ali_business_circle_order_80` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2759,7 +2759,6 @@ CREATE TABLE `ali_business_circle_order_81` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2776,7 +2775,8 @@ CREATE TABLE `ali_business_circle_order_81` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2793,7 +2793,6 @@ CREATE TABLE `ali_business_circle_order_82` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2810,7 +2809,8 @@ CREATE TABLE `ali_business_circle_order_82` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2827,7 +2827,6 @@ CREATE TABLE `ali_business_circle_order_83` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2844,7 +2843,8 @@ CREATE TABLE `ali_business_circle_order_83` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2861,7 +2861,6 @@ CREATE TABLE `ali_business_circle_order_84` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2878,7 +2877,8 @@ CREATE TABLE `ali_business_circle_order_84` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2895,7 +2895,6 @@ CREATE TABLE `ali_business_circle_order_85` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2912,7 +2911,8 @@ CREATE TABLE `ali_business_circle_order_85` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2929,7 +2929,6 @@ CREATE TABLE `ali_business_circle_order_86` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2946,7 +2945,8 @@ CREATE TABLE `ali_business_circle_order_86` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2963,7 +2963,6 @@ CREATE TABLE `ali_business_circle_order_87` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -2980,7 +2979,8 @@ CREATE TABLE `ali_business_circle_order_87` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2997,7 +2997,6 @@ CREATE TABLE `ali_business_circle_order_88` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3014,7 +3013,8 @@ CREATE TABLE `ali_business_circle_order_88` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3031,7 +3031,6 @@ CREATE TABLE `ali_business_circle_order_89` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3048,7 +3047,8 @@ CREATE TABLE `ali_business_circle_order_89` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3065,7 +3065,6 @@ CREATE TABLE `ali_business_circle_order_90` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3082,7 +3081,8 @@ CREATE TABLE `ali_business_circle_order_90` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3099,7 +3099,6 @@ CREATE TABLE `ali_business_circle_order_91` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3116,7 +3115,8 @@ CREATE TABLE `ali_business_circle_order_91` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3133,7 +3133,6 @@ CREATE TABLE `ali_business_circle_order_92` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3150,7 +3149,8 @@ CREATE TABLE `ali_business_circle_order_92` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3167,7 +3167,6 @@ CREATE TABLE `ali_business_circle_order_93` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3184,7 +3183,8 @@ CREATE TABLE `ali_business_circle_order_93` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3201,7 +3201,6 @@ CREATE TABLE `ali_business_circle_order_94` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3218,7 +3217,8 @@ CREATE TABLE `ali_business_circle_order_94` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3235,7 +3235,6 @@ CREATE TABLE `ali_business_circle_order_95` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3252,7 +3251,8 @@ CREATE TABLE `ali_business_circle_order_95` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3269,7 +3269,6 @@ CREATE TABLE `ali_business_circle_order_96` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3286,7 +3285,8 @@ CREATE TABLE `ali_business_circle_order_96` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3303,7 +3303,6 @@ CREATE TABLE `ali_business_circle_order_97` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3320,7 +3319,8 @@ CREATE TABLE `ali_business_circle_order_97` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3337,7 +3337,6 @@ CREATE TABLE `ali_business_circle_order_98` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3354,7 +3353,8 @@ CREATE TABLE `ali_business_circle_order_98` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3371,7 +3371,6 @@ CREATE TABLE `ali_business_circle_order_99` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `mall_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的商圈唯一标识号', `mall_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发生交易的商圈(非商圈组)的名称', @@ -3388,7 +3387,8 @@ CREATE TABLE `ali_business_circle_order_99` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104280002__third_party_orderss.sql b/mallinkAdmin/src/main/resources/db/migration/V202104280002__third_party_orderss.sql index 42c19c3ed..8f67c1d43 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104280002__third_party_orderss.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104280002__third_party_orderss.sql @@ -7,7 +7,6 @@ CREATE TABLE `wx_third_party_orders_0` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -24,7 +23,8 @@ CREATE TABLE `wx_third_party_orders_0` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -43,7 +43,6 @@ CREATE TABLE `wx_third_party_orders_1` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -60,7 +59,8 @@ CREATE TABLE `wx_third_party_orders_1` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -79,7 +79,6 @@ CREATE TABLE `wx_third_party_orders_2` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -96,7 +95,8 @@ CREATE TABLE `wx_third_party_orders_2` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -115,7 +115,6 @@ CREATE TABLE `wx_third_party_orders_3` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -132,7 +131,8 @@ CREATE TABLE `wx_third_party_orders_3` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -151,7 +151,6 @@ CREATE TABLE `wx_third_party_orders_4` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -168,7 +167,8 @@ CREATE TABLE `wx_third_party_orders_4` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -187,7 +187,6 @@ CREATE TABLE `wx_third_party_orders_5` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -204,7 +203,8 @@ CREATE TABLE `wx_third_party_orders_5` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -223,7 +223,6 @@ CREATE TABLE `wx_third_party_orders_6` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -240,7 +239,8 @@ CREATE TABLE `wx_third_party_orders_6` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -259,7 +259,6 @@ CREATE TABLE `wx_third_party_orders_7` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -276,7 +275,8 @@ CREATE TABLE `wx_third_party_orders_7` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -295,7 +295,6 @@ CREATE TABLE `wx_third_party_orders_8` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -312,7 +311,8 @@ CREATE TABLE `wx_third_party_orders_8` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -331,7 +331,6 @@ CREATE TABLE `wx_third_party_orders_9` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -348,7 +347,8 @@ CREATE TABLE `wx_third_party_orders_9` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -367,7 +367,6 @@ CREATE TABLE `wx_third_party_orders_10` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -384,7 +383,8 @@ CREATE TABLE `wx_third_party_orders_10` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -403,7 +403,6 @@ CREATE TABLE `wx_third_party_orders_11` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -420,7 +419,8 @@ CREATE TABLE `wx_third_party_orders_11` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -439,7 +439,6 @@ CREATE TABLE `wx_third_party_orders_12` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -456,7 +455,8 @@ CREATE TABLE `wx_third_party_orders_12` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -475,7 +475,6 @@ CREATE TABLE `wx_third_party_orders_13` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -492,7 +491,8 @@ CREATE TABLE `wx_third_party_orders_13` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -511,7 +511,6 @@ CREATE TABLE `wx_third_party_orders_14` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -528,7 +527,8 @@ CREATE TABLE `wx_third_party_orders_14` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -547,7 +547,6 @@ CREATE TABLE `wx_third_party_orders_15` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -564,7 +563,8 @@ CREATE TABLE `wx_third_party_orders_15` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -583,7 +583,6 @@ CREATE TABLE `wx_third_party_orders_16` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -600,7 +599,8 @@ CREATE TABLE `wx_third_party_orders_16` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -619,7 +619,6 @@ CREATE TABLE `wx_third_party_orders_17` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -636,7 +635,8 @@ CREATE TABLE `wx_third_party_orders_17` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -655,7 +655,6 @@ CREATE TABLE `wx_third_party_orders_18` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -672,7 +671,8 @@ CREATE TABLE `wx_third_party_orders_18` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -691,7 +691,6 @@ CREATE TABLE `wx_third_party_orders_19` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -708,7 +707,8 @@ CREATE TABLE `wx_third_party_orders_19` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -727,7 +727,6 @@ CREATE TABLE `wx_third_party_orders_20` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -744,7 +743,8 @@ CREATE TABLE `wx_third_party_orders_20` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -763,7 +763,6 @@ CREATE TABLE `wx_third_party_orders_21` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -780,7 +779,8 @@ CREATE TABLE `wx_third_party_orders_21` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -799,7 +799,6 @@ CREATE TABLE `wx_third_party_orders_22` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -816,7 +815,8 @@ CREATE TABLE `wx_third_party_orders_22` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -835,7 +835,6 @@ CREATE TABLE `wx_third_party_orders_23` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -852,7 +851,8 @@ CREATE TABLE `wx_third_party_orders_23` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -871,7 +871,6 @@ CREATE TABLE `wx_third_party_orders_24` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -888,7 +887,8 @@ CREATE TABLE `wx_third_party_orders_24` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -907,7 +907,6 @@ CREATE TABLE `wx_third_party_orders_25` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -924,7 +923,8 @@ CREATE TABLE `wx_third_party_orders_25` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -943,7 +943,6 @@ CREATE TABLE `wx_third_party_orders_26` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -960,7 +959,8 @@ CREATE TABLE `wx_third_party_orders_26` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -979,7 +979,6 @@ CREATE TABLE `wx_third_party_orders_27` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -996,7 +995,8 @@ CREATE TABLE `wx_third_party_orders_27` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1015,7 +1015,6 @@ CREATE TABLE `wx_third_party_orders_28` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1032,7 +1031,8 @@ CREATE TABLE `wx_third_party_orders_28` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1051,7 +1051,6 @@ CREATE TABLE `wx_third_party_orders_29` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1068,7 +1067,8 @@ CREATE TABLE `wx_third_party_orders_29` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1087,7 +1087,6 @@ CREATE TABLE `wx_third_party_orders_30` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1104,7 +1103,8 @@ CREATE TABLE `wx_third_party_orders_30` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1123,7 +1123,6 @@ CREATE TABLE `wx_third_party_orders_31` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1140,7 +1139,8 @@ CREATE TABLE `wx_third_party_orders_31` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1159,7 +1159,6 @@ CREATE TABLE `wx_third_party_orders_32` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1176,7 +1175,8 @@ CREATE TABLE `wx_third_party_orders_32` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1195,7 +1195,6 @@ CREATE TABLE `wx_third_party_orders_33` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1212,7 +1211,8 @@ CREATE TABLE `wx_third_party_orders_33` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1231,7 +1231,6 @@ CREATE TABLE `wx_third_party_orders_34` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1248,7 +1247,8 @@ CREATE TABLE `wx_third_party_orders_34` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1267,7 +1267,6 @@ CREATE TABLE `wx_third_party_orders_35` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1284,7 +1283,8 @@ CREATE TABLE `wx_third_party_orders_35` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1303,7 +1303,6 @@ CREATE TABLE `wx_third_party_orders_36` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1320,7 +1319,8 @@ CREATE TABLE `wx_third_party_orders_36` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1339,7 +1339,6 @@ CREATE TABLE `wx_third_party_orders_37` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1356,7 +1355,8 @@ CREATE TABLE `wx_third_party_orders_37` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1375,7 +1375,6 @@ CREATE TABLE `wx_third_party_orders_38` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1392,7 +1391,8 @@ CREATE TABLE `wx_third_party_orders_38` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1411,7 +1411,6 @@ CREATE TABLE `wx_third_party_orders_39` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1428,7 +1427,8 @@ CREATE TABLE `wx_third_party_orders_39` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1447,7 +1447,6 @@ CREATE TABLE `wx_third_party_orders_40` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1464,7 +1463,8 @@ CREATE TABLE `wx_third_party_orders_40` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1483,7 +1483,6 @@ CREATE TABLE `wx_third_party_orders_41` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1500,7 +1499,8 @@ CREATE TABLE `wx_third_party_orders_41` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1519,7 +1519,6 @@ CREATE TABLE `wx_third_party_orders_42` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1536,7 +1535,8 @@ CREATE TABLE `wx_third_party_orders_42` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1555,7 +1555,6 @@ CREATE TABLE `wx_third_party_orders_43` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1572,7 +1571,8 @@ CREATE TABLE `wx_third_party_orders_43` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1591,7 +1591,6 @@ CREATE TABLE `wx_third_party_orders_44` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1608,7 +1607,8 @@ CREATE TABLE `wx_third_party_orders_44` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1627,7 +1627,6 @@ CREATE TABLE `wx_third_party_orders_45` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1644,7 +1643,8 @@ CREATE TABLE `wx_third_party_orders_45` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1663,7 +1663,6 @@ CREATE TABLE `wx_third_party_orders_46` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1680,7 +1679,8 @@ CREATE TABLE `wx_third_party_orders_46` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1699,7 +1699,6 @@ CREATE TABLE `wx_third_party_orders_47` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1716,7 +1715,8 @@ CREATE TABLE `wx_third_party_orders_47` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1735,7 +1735,6 @@ CREATE TABLE `wx_third_party_orders_48` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1752,7 +1751,8 @@ CREATE TABLE `wx_third_party_orders_48` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1771,7 +1771,6 @@ CREATE TABLE `wx_third_party_orders_49` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1788,7 +1787,8 @@ CREATE TABLE `wx_third_party_orders_49` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1807,7 +1807,6 @@ CREATE TABLE `wx_third_party_orders_50` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1824,7 +1823,8 @@ CREATE TABLE `wx_third_party_orders_50` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1843,7 +1843,6 @@ CREATE TABLE `wx_third_party_orders_51` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1860,7 +1859,8 @@ CREATE TABLE `wx_third_party_orders_51` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1879,7 +1879,6 @@ CREATE TABLE `wx_third_party_orders_52` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1896,7 +1895,8 @@ CREATE TABLE `wx_third_party_orders_52` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1915,7 +1915,6 @@ CREATE TABLE `wx_third_party_orders_53` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1932,7 +1931,8 @@ CREATE TABLE `wx_third_party_orders_53` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1951,7 +1951,6 @@ CREATE TABLE `wx_third_party_orders_54` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -1968,7 +1967,8 @@ CREATE TABLE `wx_third_party_orders_54` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -1987,7 +1987,6 @@ CREATE TABLE `wx_third_party_orders_55` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2004,7 +2003,8 @@ CREATE TABLE `wx_third_party_orders_55` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2023,7 +2023,6 @@ CREATE TABLE `wx_third_party_orders_56` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2040,7 +2039,8 @@ CREATE TABLE `wx_third_party_orders_56` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2059,7 +2059,6 @@ CREATE TABLE `wx_third_party_orders_57` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2076,7 +2075,8 @@ CREATE TABLE `wx_third_party_orders_57` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2095,7 +2095,6 @@ CREATE TABLE `wx_third_party_orders_58` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2112,7 +2111,8 @@ CREATE TABLE `wx_third_party_orders_58` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2131,7 +2131,6 @@ CREATE TABLE `wx_third_party_orders_59` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2148,7 +2147,8 @@ CREATE TABLE `wx_third_party_orders_59` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2167,7 +2167,6 @@ CREATE TABLE `wx_third_party_orders_60` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2184,7 +2183,8 @@ CREATE TABLE `wx_third_party_orders_60` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2203,7 +2203,6 @@ CREATE TABLE `wx_third_party_orders_61` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2220,7 +2219,8 @@ CREATE TABLE `wx_third_party_orders_61` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2239,7 +2239,6 @@ CREATE TABLE `wx_third_party_orders_62` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2256,7 +2255,8 @@ CREATE TABLE `wx_third_party_orders_62` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2275,7 +2275,6 @@ CREATE TABLE `wx_third_party_orders_63` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2292,7 +2291,8 @@ CREATE TABLE `wx_third_party_orders_63` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2311,7 +2311,6 @@ CREATE TABLE `wx_third_party_orders_64` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2328,7 +2327,8 @@ CREATE TABLE `wx_third_party_orders_64` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2347,7 +2347,6 @@ CREATE TABLE `wx_third_party_orders_65` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2364,7 +2363,8 @@ CREATE TABLE `wx_third_party_orders_65` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2383,7 +2383,6 @@ CREATE TABLE `wx_third_party_orders_66` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2400,7 +2399,8 @@ CREATE TABLE `wx_third_party_orders_66` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2419,7 +2419,6 @@ CREATE TABLE `wx_third_party_orders_67` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2436,7 +2435,8 @@ CREATE TABLE `wx_third_party_orders_67` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2455,7 +2455,6 @@ CREATE TABLE `wx_third_party_orders_68` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2472,7 +2471,8 @@ CREATE TABLE `wx_third_party_orders_68` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2491,7 +2491,6 @@ CREATE TABLE `wx_third_party_orders_69` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2508,7 +2507,8 @@ CREATE TABLE `wx_third_party_orders_69` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2527,7 +2527,6 @@ CREATE TABLE `wx_third_party_orders_70` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2544,7 +2543,8 @@ CREATE TABLE `wx_third_party_orders_70` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2563,7 +2563,6 @@ CREATE TABLE `wx_third_party_orders_71` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2580,7 +2579,8 @@ CREATE TABLE `wx_third_party_orders_71` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2599,7 +2599,6 @@ CREATE TABLE `wx_third_party_orders_72` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2616,7 +2615,8 @@ CREATE TABLE `wx_third_party_orders_72` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2635,7 +2635,6 @@ CREATE TABLE `wx_third_party_orders_73` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2652,7 +2651,8 @@ CREATE TABLE `wx_third_party_orders_73` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2671,7 +2671,6 @@ CREATE TABLE `wx_third_party_orders_74` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2688,7 +2687,8 @@ CREATE TABLE `wx_third_party_orders_74` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2707,7 +2707,6 @@ CREATE TABLE `wx_third_party_orders_75` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2724,7 +2723,8 @@ CREATE TABLE `wx_third_party_orders_75` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2743,7 +2743,6 @@ CREATE TABLE `wx_third_party_orders_76` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2760,7 +2759,8 @@ CREATE TABLE `wx_third_party_orders_76` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2779,7 +2779,6 @@ CREATE TABLE `wx_third_party_orders_77` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2796,7 +2795,8 @@ CREATE TABLE `wx_third_party_orders_77` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2815,7 +2815,6 @@ CREATE TABLE `wx_third_party_orders_78` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2832,7 +2831,8 @@ CREATE TABLE `wx_third_party_orders_78` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2851,7 +2851,6 @@ CREATE TABLE `wx_third_party_orders_79` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2868,7 +2867,8 @@ CREATE TABLE `wx_third_party_orders_79` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2887,7 +2887,6 @@ CREATE TABLE `wx_third_party_orders_80` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2904,7 +2903,8 @@ CREATE TABLE `wx_third_party_orders_80` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2923,7 +2923,6 @@ CREATE TABLE `wx_third_party_orders_81` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2940,7 +2939,8 @@ CREATE TABLE `wx_third_party_orders_81` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2959,7 +2959,6 @@ CREATE TABLE `wx_third_party_orders_82` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -2976,7 +2975,8 @@ CREATE TABLE `wx_third_party_orders_82` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -2995,7 +2995,6 @@ CREATE TABLE `wx_third_party_orders_83` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3012,7 +3011,8 @@ CREATE TABLE `wx_third_party_orders_83` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3031,7 +3031,6 @@ CREATE TABLE `wx_third_party_orders_84` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3048,7 +3047,8 @@ CREATE TABLE `wx_third_party_orders_84` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3067,7 +3067,6 @@ CREATE TABLE `wx_third_party_orders_85` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3084,7 +3083,8 @@ CREATE TABLE `wx_third_party_orders_85` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3103,7 +3103,6 @@ CREATE TABLE `wx_third_party_orders_86` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3120,7 +3119,8 @@ CREATE TABLE `wx_third_party_orders_86` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3139,7 +3139,6 @@ CREATE TABLE `wx_third_party_orders_87` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3156,7 +3155,8 @@ CREATE TABLE `wx_third_party_orders_87` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3175,7 +3175,6 @@ CREATE TABLE `wx_third_party_orders_88` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3192,7 +3191,8 @@ CREATE TABLE `wx_third_party_orders_88` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3211,7 +3211,6 @@ CREATE TABLE `wx_third_party_orders_89` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3228,7 +3227,8 @@ CREATE TABLE `wx_third_party_orders_89` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3247,7 +3247,6 @@ CREATE TABLE `wx_third_party_orders_90` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3264,7 +3263,8 @@ CREATE TABLE `wx_third_party_orders_90` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3283,7 +3283,6 @@ CREATE TABLE `wx_third_party_orders_91` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3300,7 +3299,8 @@ CREATE TABLE `wx_third_party_orders_91` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3319,7 +3319,6 @@ CREATE TABLE `wx_third_party_orders_92` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3336,7 +3335,8 @@ CREATE TABLE `wx_third_party_orders_92` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3355,7 +3355,6 @@ CREATE TABLE `wx_third_party_orders_93` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3372,7 +3371,8 @@ CREATE TABLE `wx_third_party_orders_93` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3391,7 +3391,6 @@ CREATE TABLE `wx_third_party_orders_94` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3408,7 +3407,8 @@ CREATE TABLE `wx_third_party_orders_94` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3427,7 +3427,6 @@ CREATE TABLE `wx_third_party_orders_95` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3444,7 +3443,8 @@ CREATE TABLE `wx_third_party_orders_95` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3463,7 +3463,6 @@ CREATE TABLE `wx_third_party_orders_96` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3480,7 +3479,8 @@ CREATE TABLE `wx_third_party_orders_96` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3499,7 +3499,6 @@ CREATE TABLE `wx_third_party_orders_97` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3516,7 +3515,8 @@ CREATE TABLE `wx_third_party_orders_97` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3535,7 +3535,6 @@ CREATE TABLE `wx_third_party_orders_98` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3552,7 +3551,8 @@ CREATE TABLE `wx_third_party_orders_98` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, @@ -3571,7 +3571,6 @@ CREATE TABLE `wx_third_party_orders_99` ( `notice_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知id', `notice_create_time` datetime(0) DEFAULT NULL COMMENT '通知创建时间', `notice_event_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功通知的类型为:MALL_TRANSACTION.SUCCESS', - `notice_resource_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通知的资源数据类型', `summary` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '回调摘要', `shop_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店名称', `shop_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '门店编号', @@ -3588,7 +3587,8 @@ CREATE TABLE `wx_third_party_orders_99` ( `earn_points` tinyint(1) DEFAULT NULL COMMENT '是否更新积分(1:是,0:否)', `increased_points` int(11) DEFAULT NULL COMMENT '订单更新积分值', `points_update_time` datetime(0) DEFAULT NULL COMMENT '积分更新时间', - `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款(1:是,0:否)', + `is_refund` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否退款订单(1:是,0:否)', + `order_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '正常订单状态(is_refund=0时)1:部分退款2:订单关闭', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信支付退款单号', `refund_amount` int(11) COMMENT '用户退款金额,单位(分)', PRIMARY KEY (`id`) USING BTREE, diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java index 86dad5975..4e8a27838 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -84,7 +84,6 @@ public class WxBusinessOrderController extends BaseController { wxBusinessCircleOrder.setNoticeId(notifyData.getId()); wxBusinessCircleOrder.setNoticeCreateTime(sdf.parse(notifyData.getCreateTime())); wxBusinessCircleOrder.setNoticeEventType(notifyData.getEventType()); - wxBusinessCircleOrder.setNoticeResourceType(notifyData.getResourceType()); wxBusinessCircleOrder.setSummary(notifyData.getSummary()); //解密 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java index d46ed44cb..89f39aff2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java @@ -26,9 +26,6 @@ public class BusinessCircleBase extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知类型:MALL_TRANSACTION.SUCCESS",name="noticeEventType") private String noticeEventType; - @io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知资源数据类型:encrypt-resource",name="noticeResourceType") - private String noticeResourceType; - @io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知回调摘要",name="summary") private String summary; @@ -84,6 +81,9 @@ public class BusinessCircleBase extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="是否退款(1:是,0:否)",name="isRefund") private Integer isRefund; + @io.swagger.annotations.ApiModelProperty(value="正常订单状态(is_refund=0时)1:部分退款2:订单关闭",name="orderStatus") + private Integer orderStatus; + @io.swagger.annotations.ApiModelProperty(value="微信支付退款单号",name="refundId") private String refundId; diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index d1d5c70b6..eef144ad3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -35,4 +35,10 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper - @@ -34,6 +33,7 @@ + @@ -42,10 +42,10 @@ `id`, `tenant_id`, `parent_tenant_id`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`,`mall_id`, `mall_name`, `mall_store_id`, `buyer_id`, - `time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`,`mall_id`, `mall_name`, `mall_store_id`, `buyer_id`, + `time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `increased_points`, `points_update_time`, - `is_refund`, `refund_id`, `refund_amount` + `is_refund`, `order_status`, `refund_id`, `refund_amount` @@ -101,6 +101,10 @@ and `is_refund` = #{isRefund} + + and `order_status` = #{orderStatus} + + and `refund_id` = #{refundId} @@ -114,14 +118,14 @@ order by ${sortColumns} - select from ali_business_circle_order - select from ali_business_circle_order @@ -129,7 +133,7 @@ and tenant_id=#{tenantId} - select from ali_business_circle_order @@ -138,7 +142,7 @@ and `transaction_id` = #{transactionId} - select from ali_business_circle_order @@ -147,7 +151,7 @@ and `refund_id` = #{refundId} - select from ali_business_circle_order @@ -156,37 +160,44 @@ and `transaction_id` = #{transactionId} - + INSERT INTO ali_business_circle_order ( `id`, `tenant_id`, `parent_tenant_id`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`, `mall_id`, `mall_name`, `mall_store_id`, `buyer_id`,`time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`, `mall_id`, `mall_name`, `mall_store_id`, `buyer_id`,`time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_refund` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{mallId},#{mallName},#{mallStoreId},#{buyerId},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, + #{summary},#{mallId},#{mallName},#{mallStoreId},#{buyerId},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,0 ); - + update ali_business_circle_order set `earn_points` = 1, `increased_points` = #{increasedPoints}, `points_update_time` = #{pointsUpdateTime}, `update_time` = #{updateTime} where `id` = #{id} and `tenant_id` = #{tenantId} - + INSERT INTO ali_business_circle_order ( `id`, `tenant_id`, `parent_tenant_id`,`notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`,`mall_id`, `mall_name`, `mall_store_id`, `buyer_id`, `time_end`, `amount`,`pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`,`mall_id`, `mall_name`, `mall_store_id`, `buyer_id`, `time_end`, `amount`,`pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_refund`, `refund_id`, `refund_amount` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{mallId},#{mallName},#{mallStoreId},#{buyerId},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, + #{summary},#{mallId},#{mallName},#{mallStoreId},#{buyerId},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,1,#{refundId},#{refundAmount} ); + + update ali_business_circle_order set + `order_status` = #{orderStatus}, + `update_time` = #{updateTime} + where `id` = #{id} and `tenant_id` = #{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 958c19956..43df5356a 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -8,7 +8,6 @@ - @@ -35,6 +34,7 @@ + @@ -43,10 +43,10 @@ `id`, `tenant_id`, `parent_tenant_id`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, + `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, `appid`, `openid`, `time_end`, `amount`, `pay_amount`, `transaction_id`, `commit_tag`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `increased_points`, `points_update_time`, `is_points_notify`, - `is_refund`, `refund_id`, `refund_amount` + `is_refund`, `order_status`, `refund_id`, `refund_amount` @@ -122,6 +122,10 @@ and `is_refund` = #{isRefund} + + and `order_status` = #{orderStatus} + + and `refund_id` = #{refundId} @@ -180,13 +184,13 @@ INSERT INTO wx_business_circle_order ( `id`, `tenant_id`, `parent_tenant_id`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, + `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, `appid`, `openid`, `time_end`, `amount`, `pay_amount`, `transaction_id`, `commit_tag`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_points_notify`, `is_refund` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{wxMchid},#{wxMerchantName},#{wxShopName},#{wxShopNumber}, + #{summary},#{wxMchid},#{wxMerchantName},#{wxShopName},#{wxShopNumber}, #{appid},#{openid},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{commitTag},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,0,0 ); @@ -209,16 +213,23 @@ INSERT INTO wx_business_circle_order ( `id`, `tenant_id`, `parent_tenant_id`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, + `summary`, `wx_mchid`, `wx_merchant_name`, `wx_shop_name`, `wx_shop_number`, `appid`, `openid`, `time_end`, `amount`,`pay_amount`, `transaction_id`, `commit_tag`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_refund`, `refund_id`, `refund_amount` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{wxMchid},#{wxMerchantName},#{wxShopName},#{wxShopNumber}, + #{summary},#{wxMchid},#{wxMerchantName},#{wxShopName},#{wxShopNumber}, #{appid},#{openid},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{commitTag},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,1,#{refundId},#{refundAmount} ); + + update wx_business_circle_order set + `order_status` = #{orderStatus}, + `update_time` = #{updateTime} + where `id` = #{id} and `tenant_id` = #{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml index ae03e973d..f4ccaa263 100644 --- a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml @@ -12,7 +12,6 @@ - @@ -38,6 +37,7 @@ + @@ -46,10 +46,10 @@ `id`, `tenant_id`, `parent_tenant_id`, `source_app_id`, `source_type`,`notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`,`shop_name`, `shop_number`, `user_phone`, `user_number`, - `time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`,`shop_name`, `shop_number`, `user_phone`, `user_number`, + `time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `increased_points`, `points_update_time`, - `is_refund`, `refund_id`, `refund_amount` + `is_refund`, `order_status`, `refund_id`, `refund_amount` @@ -121,6 +121,10 @@ and `is_refund` = #{isRefund} + + and `order_status` = #{orderStatus} + + and `refund_id` = #{refundId} @@ -181,12 +185,12 @@ INSERT INTO wx_third_party_orders ( `id`, `tenant_id`, `parent_tenant_id`,`source_app_id`, `source_type`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`, `shop_name`, `shop_number`, `user_phone`, `user_number`,`time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`, `shop_name`, `shop_number`, `user_phone`, `user_number`,`time_end`, `amount`, `pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_refund` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{sourceAppId},#{sourceType},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{shopName},#{shopNumber},#{userPhone},#{userNumber},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, + #{summary},#{shopName},#{shopNumber},#{userPhone},#{userNumber},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,0 ); @@ -201,14 +205,21 @@ INSERT INTO wx_third_party_orders ( `id`, `tenant_id`, `parent_tenant_id`,`source_app_id`, `source_type`, `notice_id`, `notice_create_time`, `notice_event_type`, - `notice_resource_type`, `summary`,`shop_name`, `shop_number`, `user_phone`, `user_number`, `time_end`, `amount`,`pay_amount`, `transaction_id`, `create_time`, `update_time`, + `summary`,`shop_name`, `shop_number`, `user_phone`, `user_number`, `time_end`, `amount`,`pay_amount`, `transaction_id`, `create_time`, `update_time`, `merchant_id`, `c_user_id`, `earn_points`, `is_refund`, `refund_id`, `refund_amount` ) VALUES( #{id},#{tenantId},#{parentTenantId},#{sourceAppId},#{sourceType},#{noticeId},#{noticeCreateTime},#{noticeEventType}, - #{noticeResourceType},#{summary},#{shopName},#{shopNumber},#{userPhone},#{userNumber},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, + #{summary},#{shopName},#{shopNumber},#{userPhone},#{userNumber},#{timeEnd},#{amount},#{payAmount},#{transactionId},#{createTime},#{updateTime}, #{merchantId},#{cUserId},0,1,#{refundId},#{refundAmount} ); + + update wx_third_party_orders set + `order_status` = #{orderStatus}, + `update_time` = #{updateTime} + where `id` = #{id} and `tenant_id` = #{tenantId} + + From 7a0fdd1564bfb1720d2d37dbfcc491b2eff9e438 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 15:58:24 +0800 Subject: [PATCH 06/14] businessCircle tran --- .../iformall/controller/UserThirdCircleOrderController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 576dadd28..db2855f00 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -79,7 +79,7 @@ public class UserThirdCircleOrderController extends BaseController { if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } - if(NumberUtils.isCreatable(amount)){ + if(!NumberUtils.isCreatable(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); } @@ -137,7 +137,7 @@ public class UserThirdCircleOrderController extends BaseController { } catch (ParseException e) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确"); } - if(StringUtils.isNotBlank(refundAmount) && NumberUtils.isCreatable(refundAmount)){ + if(StringUtils.isNotBlank(refundAmount) && !NumberUtils.isCreatable(refundAmount)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"refundAmount为非数字"); } @@ -213,7 +213,7 @@ public class UserThirdCircleOrderController extends BaseController { if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } - if(NumberUtils.isCreatable(amount)){ + if(!NumberUtils.isCreatable(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); } From bc452cfe87438c330862ec84a35a4fa594397408 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 16:19:06 +0800 Subject: [PATCH 07/14] businessCircle tran --- .../iformall/controller/UserThirdCircleOrderController.java | 6 +++--- .../com/iformall/service/WxThirdPartyOrdersService.java | 2 +- .../service/impl/WxThirdPartyOrdersServiceImpl.java | 5 +++-- .../src/main/resources/mapper/WxThirdPartyOrdersMapper.xml | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index db2855f00..40c9c240b 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -102,7 +102,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } @@ -162,7 +162,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } @@ -237,7 +237,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java index 8b481babf..ed6771231 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java @@ -32,7 +32,7 @@ public interface WxThirdPartyOrdersService { * @return */ WxThirdPartyOrders getOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId); - WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId); + WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId); List getRefundOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index e38d229bf..fa0661c6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -72,8 +72,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService } @Override - public WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId) { + public WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId) { WxThirdPartyOrders recordQ = new WxThirdPartyOrders(); + recordQ.setSourceType(orderType.getCode()); recordQ.setRefundId(refundId); recordQ.setTenantId(tenantId); return wxThirdPartyOrdersMapper.getRefundOrderByRefundId(recordQ); @@ -191,7 +192,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService logger.error("--第三方退款--付款消息未找到--transactionId="+record.getTransactionId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "付款消息未找到"); }else{ - WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(record.getRefundId(),record.getTenantId()); + WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.RMB_PAY,record.getRefundId(),record.getTenantId()); if(refundOrder != null){ logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); }else{ diff --git a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml index f4ccaa263..e28821a96 100644 --- a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml @@ -158,7 +158,7 @@ from wx_third_party_orders where `is_refund` = 0 - and `sourceType` = #{sourceType} + and `source_type` = #{sourceType} and `tenant_id` = #{tenantId} and `transaction_id` = #{transactionId} @@ -168,6 +168,7 @@ from wx_third_party_orders where `is_refund` = 1 + and `source_type` = #{sourceType} and tenant_id = #{tenantId} and `refund_id` = #{refundId} @@ -177,7 +178,7 @@ from wx_third_party_orders where `is_refund` = 1 - and `sourceType` = #{sourceType} + and `source_type` = #{sourceType} and `tenant_id` = #{tenantId} and `transaction_id` = #{transactionId} From b30038b2e7983dad6aa7b81c2830a46e0c04c9ac Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 16:40:12 +0800 Subject: [PATCH 08/14] businessCircle tran --- .../UserThirdCircleOrderController.java | 2 +- .../main/java/com/iformall/utils/AppTest.java | 33 ++++++++++++++----- .../impl/WxThirdPartyOrdersServiceImpl.java | 4 +++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 40c9c240b..f22b182a2 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -151,7 +151,7 @@ public class UserThirdCircleOrderController extends BaseController { thirdPartyOrders.setSourceType(EnumThirdOrderType.RMB_PAY.getCode()); thirdPartyOrders.setTransactionId(transactionId); - thirdPartyOrders.setEndTime(refundTimeDate); + thirdPartyOrders.setTimeEnd(refundTimeDate); thirdPartyOrders.setSummary(refundSummary); thirdPartyOrders.setRefundAmount(Integer.parseInt(refundAmount)); thirdPartyOrders.setRefundId(refundId); diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index f4b536a39..71d289d8b 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -36,15 +36,25 @@ public class AppTest { /** * 创建交易信息 参数 */ +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","542490555719278592");//***会员Id +// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-04-26 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("amount","1000");//***付款金额(分) +// paramMap.put("summary","我要加积分");//付款摘要 + + /** + * 交易退款信息 参数 + */ IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","542490555719278592");//***会员Id - paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-04-26 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","1000");//***付款金额(分) - paramMap.put("summary","我要加积分");//付款摘要 + paramMap.put("transactionId","547662852896411648");//***订单Id + paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("refundAmount","1000");//***退款金额(分) + paramMap.put("refundSummary","我要退款");//付款摘要 + paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 /** @@ -63,7 +73,12 @@ public class AppTest { /** * 创建交易信息 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); + + /** + * 创建交易信息 接口 + */ + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); System.out.println(s); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index fa0661c6c..83822ee1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -229,6 +229,10 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService record.setCreateTime(now); record.setUpdateTime(now); + record.setShopName(order.getShopName()); + record.setShopNumber(order.getShopNumber()); + record.setUserPhone(order.getUserPhone()); + record.setUserNumber(order.getUserNumber()); record.setAmount(order.getAmount()); record.setPayAmount(order.getPayAmount()); record.setCUserId(order.getCUserId()); From a906127bd6d75f62eeba0877f98fd6eecd3888f3 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 17:14:47 +0800 Subject: [PATCH 09/14] businessCircle tran --- .../db/migration/V202104280003__merchant_code.sql | 8 +++++++- .../java/com/iformall/controller/BaseController.java | 9 +++++++++ .../controller/UserThirdCircleOrderController.java | 4 +++- .../java/com/iformall/domain/po/WxThirdPartyApi.java | 6 ++++++ .../java/com/iformall/domain/po/WxThirdPartyOrders.java | 4 ++++ .../service/impl/AliBusinessCircleOrderServiceImpl.java | 4 ++-- .../service/impl/WxBusinessCircleOrderServiceImpl.java | 6 +++--- .../service/impl/WxThirdPartyApiServiceImpl.java | 2 +- .../service/impl/WxThirdPartyOrdersServiceImpl.java | 8 +++++--- .../src/main/java/com/iformall/utils/Constant.java | 1 + .../src/main/resources/mapper/WxThirdPartyApiMapper.xml | 4 +++- 11 files changed, 44 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104280003__merchant_code.sql b/mallinkAdmin/src/main/resources/db/migration/V202104280003__merchant_code.sql index a00c0d125..cc8ee6180 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104280003__merchant_code.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104280003__merchant_code.sql @@ -1,3 +1,9 @@ ALTER TABLE `wx_merchant` ADD COLUMN `encode` varchar(50) COMMENT '唯一编码' AFTER `name`, -ADD UNIQUE INDEX `code_unique`(`encode`) USING BTREE; \ No newline at end of file +ADD UNIQUE INDEX `code_unique`(`encode`) USING BTREE; + + + +ALTER TABLE `wx_third_party_api` +ADD COLUMN `name` varchar(255) COMMENT '名称' AFTER `type`, +ADD COLUMN `remark` varchar(255) COMMENT '描述' AFTER `tp_id`; \ No newline at end of file diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java index fb8f2f2a6..4842392e4 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java @@ -1,6 +1,8 @@ package com.iformall.controller; +import com.iformall.domain.po.WxThirdPartyApi; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.service.WxThirdPartyApiService; import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; import org.slf4j.Logger; @@ -28,6 +30,9 @@ public class BaseController { @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; + + @Autowired + WxThirdPartyApiService wxThirdPartyApiService; @InitBinder public void InitBinder(WebDataBinder dataBinder) { @@ -57,6 +62,10 @@ public class BaseController { return appId; } + public WxThirdPartyApi getAppConfig() { + return wxThirdPartyApiService.findByApp(this.getAppId(),null); + } + public TenantEntity getTenantInfo() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index f22b182a2..8a1c8e649 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -86,6 +86,7 @@ public class UserThirdCircleOrderController extends BaseController { WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.setSourceAppId(getAppId()); + thirdPartyOrders.setSourceAppName(getAppConfig().getName()); thirdPartyOrders.setTransactionId(transactionId); thirdPartyOrders.setShopNumber(shopNumber); @@ -148,7 +149,7 @@ public class UserThirdCircleOrderController extends BaseController { WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.setSourceAppId(getAppId()); - thirdPartyOrders.setSourceType(EnumThirdOrderType.RMB_PAY.getCode()); + thirdPartyOrders.setSourceAppName(getAppConfig().getName()); thirdPartyOrders.setTransactionId(transactionId); thirdPartyOrders.setTimeEnd(refundTimeDate); @@ -220,6 +221,7 @@ public class UserThirdCircleOrderController extends BaseController { WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.setSourceAppId(getAppId()); + thirdPartyOrders.setSourceAppName(getAppConfig().getName()); thirdPartyOrders.setTransactionId(transactionId); thirdPartyOrders.setShopNumber(shopNumber); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java index e7ee75278..337f4c6a0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyApi.java @@ -17,6 +17,9 @@ public class WxThirdPartyApi extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="",name="name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="",name="appId") private String appId; @@ -44,6 +47,9 @@ public class WxThirdPartyApi extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="",name="version") private String version; + @io.swagger.annotations.ApiModelProperty(value="",name="remark") + private String remark; + @io.swagger.annotations.ApiModelProperty(value="",name="tpId") private String tpId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java index a5dbbbce9..abc94c7f3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,9 @@ public class WxThirdPartyOrders extends BusinessCircleBase { @io.swagger.annotations.ApiModelProperty(value="来源(wx_third_party_api)",name="sourceAppId") private String sourceAppId; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="来源(wx_third_party_api)",name="sourceAppName") + private String sourceAppName; @io.swagger.annotations.ApiModelProperty(value="1:RMB订单;2:积分订单",name="sourceType") private Integer sourceType; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 74757b801..05eebad67 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -146,7 +146,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose("Ali商圈消费:消费商户["+wxMerchant.getName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose("支付宝商圈消费:商户["+wxMerchant.getName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -250,7 +250,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder int points = order.getIncreasedPoints(); creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose("Ali商圈消费退款:商户["+wxMerchant.getName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose("支付宝商圈退款:商户["+wxMerchant.getName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index abb278d7f..b827c4347 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -107,7 +107,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe if (wxMerchant != null) { record.setMerchantId(wxMerchant.getId()); } else { - logger.error("--Wx商圈付款通知消息未找到门店--shopName=" + record.getWxShopName() + "&shopNumber=" + record.getWxShopNumber()); + logger.error("--wx商圈付款通知消息未找到门店--shopName=" + record.getWxShopName() + "&shopNumber=" + record.getWxShopNumber()); } WxCUser userQ = new WxCUser(); userQ.updateTenantInfo(record); @@ -136,7 +136,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose("Wx商圈消费:消费商户["+record.getWxShopName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose("微信商圈消费:商户["+record.getWxShopName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -241,7 +241,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose("Wx商圈消费退款:商户["+record.getWxShopName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose("微信商圈退款:商户["+record.getWxShopName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java index a94114c0b..00ba72c95 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java @@ -37,7 +37,7 @@ public class WxThirdPartyApiServiceImpl implements WxThirdPartyApiService { @Override public WxThirdPartyApi findByApp(String appId, String appKey) { - if(StringUtils.isBlank(appId) || StringUtils.isBlank(appKey)){ + if(StringUtils.isBlank(appId)){ return null; } WxThirdPartyApi apiConfig = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 83822ee1c..f72eaeb31 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -155,7 +155,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose("第三方消费:消费商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose(record.getSourceAppName()+"消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -229,6 +229,8 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService record.setCreateTime(now); record.setUpdateTime(now); + record.setSourceType(EnumThirdOrderType.RMB_PAY.getCode()); + record.setShopName(order.getShopName()); record.setShopNumber(order.getShopNumber()); record.setUserPhone(order.getUserPhone()); @@ -269,7 +271,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose("第三方消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose(record.getSourceAppName()+"消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -359,7 +361,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService wxCreditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); wxCreditHistory.setCreditNum(record.getAmount()); wxCreditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); - wxCreditHistory.setChangePurpose("第三方积分抵扣{}"+record.getSummary()); + wxCreditHistory.setChangePurpose(record.getSourceAppName()+"积分抵扣{}"+record.getSummary()); wxCreditHistory.setCouponId(record.getId()); wxCreditHistoryService.saveOrUpdate(wxCreditHistory,record.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 3dc6d858b..fcd5304d7 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -52,6 +52,7 @@ public class Constant { public static final String REQUEST_C_USER_KEY = "REQUEST_C_USER"; public static final String APP_Id = "APP_Id"; + public static final String APP_NAME = "APP_NAME"; public static final String LOGIN_B_USER_KEY = "LOGIN_B_USER_KEY"; diff --git a/mallinkService/src/main/resources/mapper/WxThirdPartyApiMapper.xml b/mallinkService/src/main/resources/mapper/WxThirdPartyApiMapper.xml index e9201195f..85a0e4be3 100644 --- a/mallinkService/src/main/resources/mapper/WxThirdPartyApiMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxThirdPartyApiMapper.xml @@ -6,6 +6,7 @@ + @@ -15,11 +16,12 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`type`,`app_id`,`app_key`,`sign_key`,`api_url`, `token`,`token_expired_time`,`user_name`,`password`,`version`,`tp_id` + `id`,`tenant_id`,`parent_tenant_id`,`type`,`name`,`app_id`,`app_key`,`sign_key`,`api_url`, `token`,`token_expired_time`,`user_name`,`password`,`version`,`remark`,`tp_id` From b7a6558cabca467b660d9cec2c44922224be20cb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 17:44:13 +0800 Subject: [PATCH 10/14] businessCircle tran --- .../UserThirdCircleOrderController.java | 6 +-- .../main/java/com/iformall/utils/AppTest.java | 23 +++++++--- .../impl/WxThirdPartyOrdersServiceImpl.java | 42 ++++++++++++------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 8a1c8e649..2a2ea1d73 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -79,7 +79,7 @@ public class UserThirdCircleOrderController extends BaseController { if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } - if(!NumberUtils.isCreatable(amount)){ + if(!NumberUtils.isCreatable(amount) || Integer.parseInt(amount) <= 0){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); } @@ -138,7 +138,7 @@ public class UserThirdCircleOrderController extends BaseController { } catch (ParseException e) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确"); } - if(StringUtils.isNotBlank(refundAmount) && !NumberUtils.isCreatable(refundAmount)){ + if(StringUtils.isNotBlank(refundAmount) && (!NumberUtils.isCreatable(refundAmount) || Integer.parseInt(refundAmount) <= 0)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"refundAmount为非数字"); } @@ -214,7 +214,7 @@ public class UserThirdCircleOrderController extends BaseController { if(StringUtils.isBlank(amount)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); } - if(!NumberUtils.isCreatable(amount)){ + if(!NumberUtils.isCreatable(amount) || Integer.parseInt(amount) <= 0){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); } diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 71d289d8b..23cbaf9cf 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -49,12 +49,25 @@ public class AppTest { /** * 交易退款信息 参数 */ +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId","547662852896411648");//***订单Id +// paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("refundAmount","1000");//退款金额(分) +// paramMap.put("refundSummary","我要退款");//付款摘要 +// paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 + + /** + * 积分抵扣 参数 + */ IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId","547662852896411648");//***订单Id - paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("refundAmount","1000");//***退款金额(分) - paramMap.put("refundSummary","我要退款");//付款摘要 - paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","542490555719278592");//***会员Id + paramMap.put("userPhone","18872592633");//会员手机号 + paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 + paramMap.put("amount","100");//***付款金额(分) + paramMap.put("summary","我要换东西");//付款摘要 /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index f72eaeb31..73fdc115b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -114,7 +114,11 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); + record.setShopName(wxMerchant.getName()); }else{ + if(StringUtils.isBlank(record.getShopName())){ + record.setShopName("第三方门店"); + } logger.info("--第三方付款通知消息未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); } @@ -155,7 +159,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose(record.getSourceAppName()+"消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose(record.getSourceAppName()+"·消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -194,7 +198,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService }else{ WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.RMB_PAY,record.getRefundId(),record.getTenantId()); if(refundOrder != null){ - logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); + logger.error("--第三方退款--退款消息已存在---RefundId="+record.getRefundId()); }else{ String lockKey = StringUtils.join(THIRD_CIRCLE_KEY,record.getRefundId(), ":",EnumYesOrNo.YES.getCode(),":", "lock"); long time = System.currentTimeMillis() + 2000; @@ -271,7 +275,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose(record.getSourceAppName()+"消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose(record.getSourceAppName()+"·消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -350,21 +354,31 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); + record.setShopName(wxMerchant.getName()); }else{ + if(StringUtils.isBlank(record.getShopName())){ + record.setShopName("第三方门店"); + } logger.info("--第三方积分抵扣未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); } - WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(record.getFinalTenantId()); - wxCreditHistory.setCUserId(basicInfo.getId()); - wxCreditHistory.setOperatorId(basicInfo.getId()); - wxCreditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); - wxCreditHistory.setCreditNum(record.getAmount()); - wxCreditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); - wxCreditHistory.setChangePurpose(record.getSourceAppName()+"积分抵扣{}"+record.getSummary()); - wxCreditHistory.setCouponId(record.getId()); - wxCreditHistoryService.saveOrUpdate(wxCreditHistory,record.getTenantId()); - + WxCreditHistory creditHistory = new WxCreditHistory(); + creditHistory.setTenantId(record.getFinalTenantId()); + creditHistory.setCUserId(basicInfo.getId()); + creditHistory.setOperatorId(basicInfo.getId()); + creditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); + creditHistory.setCreditNum(record.getAmount()); + creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); + creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣{}"+record.getSummary()); + creditHistory.setCouponId(record.getId()); + creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory, record.getTenantId()); + Integer creditNum = 0; + if (creditHistory.getCreditNum() != null) { + creditNum = creditHistory.getCreditNum(); + } + if(creditNum == 0){ + throw new MallinkException(ErrorCode.CREDIT_ZERO.getCode(), "本次扣减积分为0"); + } wxThirdPartyOrdersMapper.insertNoticeOrder(record); } redisLock.unlock(lockKey, timeStr); From 8c8208499c1f068c54a63b39d162a3ec9d64d3ac Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 18:04:12 +0800 Subject: [PATCH 11/14] businessCircle tran --- .../main/java/com/iformall/utils/AppTest.java | 49 ++++++++++--------- .../impl/WxThirdPartyOrdersServiceImpl.java | 4 +- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 23cbaf9cf..1b2685819 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -36,22 +36,22 @@ public class AppTest { /** * 创建交易信息 参数 */ -// IdWorker idWorker = IdWorker.get(); -// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id -// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 -// paramMap.put("shopName","百丽");//门店名称 -// paramMap.put("userNumber","542490555719278592");//***会员Id -// paramMap.put("userPhone","18872592633");//会员手机号 -// paramMap.put("timeEnd","2021-04-26 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) -// paramMap.put("amount","1000");//***付款金额(分) -// paramMap.put("summary","我要加积分");//付款摘要 + IdWorker idWorker = IdWorker.get(); + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","546907706202185728");//***会员Id + paramMap.put("userPhone","18872592633");//会员手机号 + paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("amount","1000");//***付款金额(分) + paramMap.put("summary","我要加积分");//付款摘要 /** * 交易退款信息 参数 */ // IdWorker idWorker = IdWorker.get(); // paramMap.put("transactionId","547662852896411648");//***订单Id -// paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("refundTime","2021-04-27 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) // paramMap.put("refundAmount","1000");//退款金额(分) // paramMap.put("refundSummary","我要退款");//付款摘要 // paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 @@ -59,15 +59,15 @@ public class AppTest { /** * 积分抵扣 参数 */ - IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","542490555719278592");//***会员Id - paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 - paramMap.put("amount","100");//***付款金额(分) - paramMap.put("summary","我要换东西");//付款摘要 +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 +// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 +// paramMap.put("amount","100");//***付款金额(分) +// paramMap.put("summary","我要换东西");//付款摘要 /** @@ -86,12 +86,17 @@ public class AppTest { /** * 创建交易信息 接口 */ -// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); /** - * 创建交易信息 接口 + * 交易退款 接口 + */ +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); + + /** + * 交易退款 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); System.out.println(s); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 73fdc115b..7e7bb4914 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -367,9 +367,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCUserId(basicInfo.getId()); creditHistory.setOperatorId(basicInfo.getId()); creditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); - creditHistory.setCreditNum(record.getAmount()); + creditHistory.setCreditNum(record.getPayAmount()); creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); - creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣{}"+record.getSummary()); + creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣-"+record.getPayAmount()+"{"+record.getSummary()+"}"); creditHistory.setCouponId(record.getId()); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory, record.getTenantId()); Integer creditNum = 0; From a20c1df798b6860426fccdbd7caef244031e0dbd Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 6 May 2021 10:22:40 +0800 Subject: [PATCH 12/14] businessCircle tran --- .../controller/UserBasicInfoController.java | 2 +- .../main/java/com/iformall/utils/AppTest.java | 42 +++++++++---------- .../iformall/domain/po/WxCUserBasicInfo.java | 2 +- .../service/impl/WxMerchantServiceImpl.java | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java index 5792c29c4..227def7c5 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java @@ -54,7 +54,7 @@ public class UserBasicInfoController extends BaseController { WxCUserBasicInfo userBasicInfo = wxCUserBasicInfoService.registerByPhone(tenantEntity, phone); List levelList = wxLevelConfigService.getByTenantInfo(tenantEntity); - userBasicInfo.setLecelList(levelList); + userBasicInfo.setLevelList(levelList); userBasicInfo.setLevel(WxLevelConfigService.DEFAULT_LEVEL); if(userBasicInfo.getPoins() != null && userBasicInfo.getPoins() > 0){ for (WxLevelConfig levelConfig : levelList) { diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 1b2685819..43793d06a 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -31,20 +31,20 @@ public class AppTest { /** * 注册并查询用户详细信息 参数 */ -// paramMap.put("phone","17600293031"); +// paramMap.put("phone","18872592633"); /** * 创建交易信息 参数 */ - IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","546907706202185728");//***会员Id - paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","1000");//***付款金额(分) - paramMap.put("summary","我要加积分");//付款摘要 +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","546907706202185728");//***会员Id +// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("amount","1000");//***付款金额(分) +// paramMap.put("summary","我要加积分");//付款摘要 /** * 交易退款信息 参数 @@ -59,15 +59,15 @@ public class AppTest { /** * 积分抵扣 参数 */ -// IdWorker idWorker = IdWorker.get(); -// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id -// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 -// paramMap.put("shopName","百丽");//门店名称 -// paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 -// paramMap.put("userPhone","18872592633");//会员手机号 -// paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 -// paramMap.put("amount","100");//***付款金额(分) -// paramMap.put("summary","我要换东西");//付款摘要 + IdWorker idWorker = IdWorker.get(); + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 + paramMap.put("userPhone","18872592633");//会员手机号 + paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 + paramMap.put("amount","100");//***付款金额(分) + paramMap.put("summary","我要换东西");//付款摘要 /** @@ -86,7 +86,7 @@ public class AppTest { /** * 创建交易信息 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); /** * 交易退款 接口 @@ -96,7 +96,7 @@ public class AppTest { /** * 交易退款 接口 */ -// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); System.out.println(s); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 8a391e36d..3876c2909 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -115,7 +115,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { private String level; @TableField(exist = false) - private List lecelList; + private List levelList; @Excel(name="积分",width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index e1bc15371..9e16d85c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -784,7 +784,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public boolean hasMerchantEncode(WxMerchant wxMerchant) { if(StringUtils.isBlank(wxMerchant.getEncode())){ - return true; + return false; }else{ return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; } From 187e9f681ae21f8c2a2953dd7b89191550f058d7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 6 May 2021 10:44:29 +0800 Subject: [PATCH 13/14] businessCircle tran --- .../com/iformall/controller/basic/WxMerchantController.java | 2 +- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 4337a6706..42d0b919b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -298,7 +298,7 @@ public class WxMerchantController extends BaseController { @TenantIgnore public ResultData hasMerchantEncode(@ModelAttribute WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchantEncode{}"+wxMerchant.toString()); - boolean has = wxMerchantService.hasMerchant(wxMerchant); + boolean has = wxMerchantService.hasMerchantEncode(wxMerchant); return new ResultData(has); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9e16d85c4..957f56a5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -786,7 +786,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if(StringUtils.isBlank(wxMerchant.getEncode())){ return false; }else{ - return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; + return wxMerchantMapper.hasMerchantEncode(wxMerchant) > 0 ? true : false; } } From 31f350b0853f9228b8916b1454916de4b908b01b Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 6 May 2021 14:36:49 +0800 Subject: [PATCH 14/14] businessCircle tran --- .../datatower/WxUserStatisticsController.java | 335 ++++++++++++++++++ 1 file changed, 335 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java new file mode 100644 index 000000000..04bcf4c7f --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java @@ -0,0 +1,335 @@ +package com.iformall.controller.datatower; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.dto.WxCUserBasicInfoDto; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.UserCountVo; +import com.iformall.enums.*; +import com.iformall.service.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; + +@RestController +@Api(description = "会员统计") +@RequestMapping("userStatistics") +public class WxUserStatisticsController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; + + @Autowired + private WxCUserService wxCUserService; + + @Autowired + private WxMallService wxMallService; + + @ApiOperation("查询微信用户数量") + @GetMapping("/findWxUserCount") + @SystemControllerLog(description = "查询微信用户数量") + public ResultData findWxUserCount() { + logger.debug("[" + getIpAddr() + "] userStatistics::findWxUserCount"); + + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + //昨日同比 + Map map = new HashMap<>(); + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.updateTenantInfo(tenantEntity); + dto.setEndTime(new Date()); + //微信用户数据 + long wxTotalCount = wxCUserService.findCount(dto,tenantEntitys);//总量 + + map.put("wxTotalCount",wxTotalCount); + + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date today = c.getTime(); + dto.setStartTime(today); + dto.setEndTime(null); + long wxTodayCount = wxCUserService.findCount(dto, tenantEntitys);//今天新增 + + map.put("wxTodayCount",wxTodayCount); + + //昨日同比 + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -1); + dto.setStartTime(c.getTime()); + c.add(Calendar.DAY_OF_YEAR, 1); + dto.setEndTime(c.getTime()); + long wxYesterdayCount = wxCUserService.findCount(dto, tenantEntitys); + if (wxYesterdayCount > 0) { + double yesterday = (double) (wxTodayCount - wxYesterdayCount) / wxYesterdayCount * 100; + double zrhb = new BigDecimal(yesterday).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + map.put("wxhb", zrhb + "%"); + } else { + map.put("wxhb", "--%"); + } + return new ResultData(map); + } + + @ApiOperation("查询会员数量") + @GetMapping("/findBasicUserCount") + @SystemControllerLog(description = "查询会员数量") + public ResultData findBasicUserCount() { + logger.debug("[" + getIpAddr() + "] WxUserStatisticsController::findBasicUserCount"); + + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + //昨日同比 + Map map = new HashMap<>(); + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.updateTenantInfo(tenantEntity); + dto.setEndTime(new Date()); + //会员用户数据 + long memTotalCount = wxCUserBasicInfoService.findCount(ifParentUpdateTenantInfo(),dto);//总量 + + map.put("memTotalCount",memTotalCount); + + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date today = c.getTime(); + dto.setStartTime(today); + dto.setEndTime(null); + long memTodayCount = wxCUserBasicInfoService.findCount(ifParentUpdateTenantInfo(),dto);//今天新增 + + map.put("memTodayCount",memTodayCount); + + //昨日同比 + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -1); + dto.setStartTime(c.getTime()); + c.add(Calendar.DAY_OF_YEAR, 1); + dto.setEndTime(c.getTime()); + long memYesterdayCount = wxCUserBasicInfoService.findCount(ifParentUpdateTenantInfo(),dto); + if (memYesterdayCount > 0) { + double yesterday = (double) (memTodayCount - memYesterdayCount) / memYesterdayCount * 100; + double zrhb = new BigDecimal(yesterday).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + map.put("memhb", zrhb + "%"); + } else { + map.put("memhb", "--%"); + } + + return new ResultData(map); + } + + @ApiOperation("查询微信用户趋势") + @GetMapping("/findWxUserTrend") + @SystemControllerLog(description = "查询微信用户趋势") + public ResultData findWxUserTrend(Date startTime, Date endTime, Integer reportType) { + logger.debug("[" + getIpAddr() + "] WxUserStatisticsController::findUserCount"); + + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.updateTenantInfo(tenantEntity); + + if (startTime == null || endTime == null) { + startTime = addMonth(new Date(), -1); + endTime = new Date(); + reportType = EnumUserCountReportType.DAY.getCode(); + } + + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(startTime); + dto.setEndTime(endTime); + dto.setReportType(reportType); + + List wxCountList = new ArrayList<>();//每日新增会员数 + List wxCounts = wxCUserService.findCountHistory(dto,tenantEntitys);//每日新增会员数 + + SimpleDateFormat sdf; + SimpleDateFormat fsdf; + if (reportType.equals(EnumUserCountReportType.YEAR.getCode())) { + sdf = new SimpleDateFormat("yyyy"); + fsdf = new SimpleDateFormat("yyyy"); + }else if (reportType.equals(EnumUserCountReportType.MONTH.getCode())) { + sdf = new SimpleDateFormat("yyyy-MM"); + fsdf = new SimpleDateFormat("yyyy-MM"); + }else { + sdf = new SimpleDateFormat("yyyy-MM-dd"); + fsdf = new SimpleDateFormat("MM-dd"); + } + + Date curTime = new Date(startTime.getTime()); + do { + UserCountVo wxUc = new UserCountVo(); + wxUc.setReportTime(fsdf.format(curTime)); + + final Date ct = new Date(curTime.getTime()); + + if (ct.before(new Date()) || ct.equals(new Date())) { + //用户 + Optional opWxUserCountVo = + wxCounts.stream().filter(md -> md.getReportTime().equals(sdf.format(ct))).findFirst(); + if (opWxUserCountVo.isPresent()) { + wxUc.setIncCount(opWxUserCountVo.get().getIncCount()); + wxUc.setTotalCount(opWxUserCountVo.get().getTotalCount()); + } else { + wxUc.setIncCount(0L); + wxUc.setTotalCount(0L); + } + + } + wxCountList.add(wxUc); + if (reportType.equals(EnumUserCountReportType.YEAR.getCode())) { + curTime = addYear(curTime, 1); + } else if (reportType.equals(EnumUserCountReportType.MONTH.getCode())) { + curTime = addMonth(curTime, 1); + } else { + curTime = addDay(curTime, 1); + } + + }while (curTime.before(endTime) || curTime.equals(endTime)); + + + if (wxCountList.size() > 0 + && wxCountList.get(0).getTotalCount() != null + && wxCountList.get(0).getTotalCount() == 0) { + WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); + pdto.updateTenantInfo(tenantEntity); + pdto.setEndTime(startTime); + wxCountList.get(0).setTotalCount(wxCUserService.findCount(pdto, tenantEntitys)); + } + for (int i = 1; i < wxCountList.size(); i++){ + if (wxCountList.get(i).getTotalCount() != null && + wxCountList.get(i-1).getTotalCount() != null && + wxCountList.get(i).getTotalCount() < wxCountList.get(i-1).getTotalCount()){ + wxCountList.get(i).setTotalCount(wxCountList.get(i-1).getTotalCount()); + } + } + + return new ResultData(wxCountList); + } + + @ApiOperation("查询会员趋势") + @GetMapping("/findBasicUserTrend") + @SystemControllerLog(description = "查询会员趋势") + public ResultData findBasicUserTrend(Date startTime, Date endTime, Integer reportType) { + logger.debug("[" + getIpAddr() + "] WxUserStatisticsController::findBasicUserTrend"); + + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.updateTenantInfo(tenantEntity); + + if (startTime == null || endTime == null) { + startTime = addMonth(new Date(), -1); + endTime = new Date(); + reportType = EnumUserCountReportType.DAY.getCode(); + } + + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(startTime); + dto.setEndTime(endTime); + dto.setReportType(reportType); + + List memCountList = new ArrayList<>();//每日新增会员数 + List memCounts = wxCUserBasicInfoService.findCountHistory(ifParentUpdateTenantInfo(),dto);//每日新增会员数 + + SimpleDateFormat sdf; + SimpleDateFormat fsdf; + if (reportType.equals(EnumUserCountReportType.YEAR.getCode())) { + sdf = new SimpleDateFormat("yyyy"); + fsdf = new SimpleDateFormat("yyyy"); + }else if (reportType.equals(EnumUserCountReportType.MONTH.getCode())) { + sdf = new SimpleDateFormat("yyyy-MM"); + fsdf = new SimpleDateFormat("yyyy-MM"); + }else { + sdf = new SimpleDateFormat("yyyy-MM-dd"); + fsdf = new SimpleDateFormat("MM-dd"); + } + + Date curTime = new Date(startTime.getTime()); + do { + UserCountVo memUc = new UserCountVo(); + memUc.setReportTime(fsdf.format(curTime)); + + final Date ct = new Date(curTime.getTime()); + + if (ct.before(new Date()) || ct.equals(new Date())) { + + //会员 + Optional opMemUserCountVo = + memCounts.stream().filter(md -> md.getReportTime().equals(sdf.format(ct))).findFirst(); + if (opMemUserCountVo.isPresent()) { + memUc.setIncCount(opMemUserCountVo.get().getIncCount()); + memUc.setTotalCount(opMemUserCountVo.get().getTotalCount()); + } else { + memUc.setIncCount(0L); + memUc.setTotalCount(0L); + } + } + memCountList.add(memUc); + if (reportType.equals(EnumUserCountReportType.YEAR.getCode())) { + curTime = addYear(curTime, 1); + } else if (reportType.equals(EnumUserCountReportType.MONTH.getCode())) { + curTime = addMonth(curTime, 1); + } else { + curTime = addDay(curTime, 1); + } + + }while (curTime.before(endTime) || curTime.equals(endTime)); + + if (memCountList.size() > 0 + && memCountList.get(0).getTotalCount() != null + && memCountList.get(0).getTotalCount() == 0) { + WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); + pdto.setEndTime(startTime); + memCountList.get(0).setTotalCount(wxCUserBasicInfoService.findCount(ifParentUpdateTenantInfo(),pdto)); + } + for (int i = 1; i < memCountList.size(); i++){ + if ( memCountList.get(i).getTotalCount() != null && + memCountList.get(i-1).getTotalCount() != null && + memCountList.get(i).getTotalCount() < memCountList.get(i-1).getTotalCount()){ + memCountList.get(i).setTotalCount(memCountList.get(i-1).getTotalCount()); + } + } + + return new ResultData(memCountList); + } + + + private Date addDay(Date date , int addDayAmount) { + Calendar c = Calendar.getInstance(); + c.setTime(date); + c.add(Calendar.DATE, addDayAmount); + Date result = c.getTime(); + return result; + } + + private Date addMonth(Date date, int addMountAmount) { + Calendar c = Calendar.getInstance(); + c.setTime(date); + c.add(Calendar.MONTH, addMountAmount); + Date result = c.getTime(); + return result; + } + + private Date addYear(Date date, int addYearAmount) { + Calendar c = Calendar.getInstance(); + c.setTime(date); + c.add(Calendar.YEAR, addYearAmount); + Date result = c.getTime(); + return result; + } + +}