From 735dd68452702fb8a43569cc615c01fa58ad7adc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 21 Jun 2019 13:15:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20=20version:?= =?UTF-8?q?.1510.1953=EF=BC=9A=E5=95=86=E9=93=BA=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E4=B8=8B=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E7=A7=9F=E9=87=91=E8=B4=A6=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E4=B8=9A=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 31d3b98ba..06be47e83 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1375,6 +1375,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContract); if (propertyContract != null) { + propertyContract.setMerchantId(record.getMerchantId()); + wxPropertyContractMapper.updateByPrimaryKeySelective(propertyContract); wxPropertyContractService.updatePropertyContractStatus(propertyContract.getId()); } } From 2460f6073792b649afafd27d9f55ce63fe977f61 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 21 Jun 2019 13:35:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906211335__L_ADD_MENU_DATA.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906211335__L_ADD_MENU_DATA.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906211335__L_ADD_MENU_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201906211335__L_ADD_MENU_DATA.sql new file mode 100644 index 000000000..b24d64a92 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906211335__L_ADD_MENU_DATA.sql @@ -0,0 +1 @@ +update mall_permission set icon = 'icon-zhangdan' where name ='商铺租赁合同'; \ No newline at end of file From 544edd7ebf04ceecb546dd665d1a5b4cf6c41f2f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 21 Jun 2019 14:05:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E6=B5=8B=E8=AF=95version:.1559.1970=EF=BC=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=90=8C=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E4=B8=A4=E6=9D=A1=E9=87=8D=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../service/impl/WxPropertyContractServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 9ed074ce1..6dcbe937d 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -12,7 +12,7 @@ public enum ErrorCode{ * 系统级别 * 1000-1999 */ - SYS_SERVER_ERROR(1000, "服务器请求异常"), + SYS_SERVER_ERROR(1000, "系统异常"), SYS_PARAMETER_ERROR(1001, "参数不合法"), SYS_PARAMETER_NOT_NULL(1002, "参数不能为空"), SYS_PARAMETER_TYPE_ERROR(1003, "参数类型异常"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index b33d919ff..f9e430be1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -270,6 +270,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService String message; boolean hasFlow = true; if (record.getId() == null) { + if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { + WxPropertyContract propertyContractQuery = new WxPropertyContract(); + propertyContractQuery.setRentContractId(record.getRentContractId()); + int propertyContractCount = wxPropertyContractMapper.selectCount(propertyContractQuery); + if (propertyContractCount > 0) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); + } + } hasFlow = false; final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); From 55510fd7d309ef752abef031f99e21dfc44372d8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 21 Jun 2019 13:40:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=80=9A=E9=81=93=E8=B4=B9=E8=AE=A1=E7=AE=97=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=83=E5=88=86=E4=B9=8B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B0=8F=E4=BA=8E83=E5=88=86=EF=BC=8C?= =?UTF-8?q?=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5,=20=E5=A4=A7=E4=BA=8E83?= =?UTF-8?q?=E5=88=86,=20=E4=B8=8D=E5=B0=8F=E4=BA=8E=E5=AE=83=E7=9A=84?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/utils/PayUtil.java | 37 -------------- .../service/impl/WxCardSpendServiceImpl.java | 9 ++-- .../impl/WxCouponOrderServiceImpl.java | 9 ++-- .../service/impl/WxPayOrderServiceImpl.java | 21 ++------ .../service/impl/WxSubsidyServiceImpl.java | 5 +- .../java/com/iformall/utils/PayUtils.java | 50 +++++++++++++++++++ .../main/java/com/iformall/utils/PayUtil.java | 37 -------------- 7 files changed, 68 insertions(+), 100 deletions(-) delete mode 100644 mallinkCallback/src/main/java/com/iformall/utils/PayUtil.java create mode 100755 mallinkService/src/main/java/com/iformall/utils/PayUtils.java delete mode 100644 mallinkSysAdmin/src/main/java/com/iformall/utils/PayUtil.java diff --git a/mallinkCallback/src/main/java/com/iformall/utils/PayUtil.java b/mallinkCallback/src/main/java/com/iformall/utils/PayUtil.java deleted file mode 100644 index 9776aad04..000000000 --- a/mallinkCallback/src/main/java/com/iformall/utils/PayUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.iformall.utils; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; - -import java.awt.image.BufferedImage; -import java.util.Hashtable; -import java.util.Map; - -public class PayUtil { - /** - * 根据url生成二位图片对象 - * - * @param codeUrl - * @return - * @throws WriterException - */ - public static BufferedImage getQRCodeImge(String codeUrl) throws WriterException { - Map hints = new Hashtable(); - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); - hints.put(EncodeHintType.CHARACTER_SET, "UTF8"); - int width = 256; - BitMatrix bitMatrix = (new MultiFormatWriter()).encode(codeUrl, BarcodeFormat.QR_CODE, width, width, hints); - BufferedImage image = new BufferedImage(width, width, 1); - for(int x = 0; x < width; ++x) { - for(int y = 0; y < width; ++y) { - image.setRGB(x, y, bitMatrix.get(x, y) ? -16777216 : -1); - } - } - - return image; - } -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 4f2f3c97d..9ecf6408b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; +import com.iformall.utils.PayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -123,8 +124,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 4. 扣减计算 Double paymentD = 1.0 * cardInfo.getSaleAmount() * record.getDeductionAmount() / cardInfo.getAmount(); Integer payment = paymentD.intValue(); - Double dChargeFee = Math.ceil(payment * 1.0D * payAccount.getRate() / 10000); - Integer real_payment = payment - dChargeFee.intValue(); + int iChargeFee = PayUtils.getPayRate(payment, payAccount.getRate()); + Integer real_payment = payment - iChargeFee; Integer remain_real_pament = cardInfo.getRemainingShareFeeAmount() - real_payment; Integer remaingAmount = cardInfo.getRemainingAmount()-record.getDeductionAmount(); @@ -189,8 +190,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { logger.info("补贴额: " + subsidyFee); if(subsidyFee > 0) { // 有补贴时入库 - Double dSubChargeFee = Math.ceil(subsidyFee * 1.0D * payAccount.getRate() / 10000); - Integer realSubsidyFee = subsidyFee - dSubChargeFee.intValue(); + int iSubChargeFee = PayUtils.getPayRate(subsidyFee, payAccount.getRate()); + Integer realSubsidyFee = subsidyFee - iSubChargeFee; WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); merchantSubsidy.setTenantId(record.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index e436598b6..eb7ff53f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -21,6 +21,7 @@ import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.utils.DateUtils; +import com.iformall.utils.PayUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -480,11 +481,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } if (subsidyNum != null && subsidyNum.intValue() > 0) { // 有补贴时入库 - Double dSubChargeFee = Math.ceil(subsidyNum * 1.0D * payAccount.getRate() / 10000); - Integer realSubsidyFee = subsidyNum - dSubChargeFee.intValue(); + int iSubChargeFee = PayUtils.getPayRate(subsidyNum, payAccount.getRate()); + Integer realSubsidyFee = subsidyNum - iSubChargeFee; - Double priceChargeFee = Math.ceil(coupon.getSalePrice() * 1.0D * payAccount.getRate() / 10000); - Integer realPayment = coupon.getSalePrice() - priceChargeFee.intValue(); + int iPriceChargeFee = PayUtils.getPayRate(coupon.getSalePrice(), payAccount.getRate()); + Integer realPayment = coupon.getSalePrice() - iPriceChargeFee; WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 2a5b16477..a1a2fc734 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -14,10 +14,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.pay.*; import com.iformall.service.*; -import com.iformall.utils.BeanUtils; -import com.iformall.utils.MapUtil; -import com.iformall.utils.Utility; -import com.iformall.utils.XmlUtil; +import com.iformall.utils.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -219,8 +216,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setShare(isShare.getCode()); if (isShare == EnumPayShare.YES) { // 分账金额 - Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 10000); - Integer share_amount = record.getPayAmount() - dChargeFee.intValue(); + int iChargeFee = PayUtils.getPayRate(record.getPayAmount(), payAccount.getRate()); + Integer share_amount = record.getPayAmount() - iChargeFee; record.setShareAmount(share_amount); } @@ -458,8 +455,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setShare(isShare.getCode()); if (isShare == EnumPayShare.YES) { // 分账金额 - Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 10000); - Integer share_amount = record.getPayAmount() - dChargeFee.intValue(); + int iChargeFee = PayUtils.getPayRate(record.getPayAmount(), payAccount.getRate()); + Integer share_amount = record.getPayAmount() - iChargeFee; record.setShareAmount(share_amount); if (share_amount <= 0) { isShare = EnumPayShare.NO; @@ -1532,12 +1529,4 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { public void deleteById(Long id) { wxPayOrderMapper.deleteByPrimaryKey(id); } - - public static void main(String[] args) { - Integer v = 50; - Integer rate = 6; - Double dChargeFee = Math.ceil(v * 1.0D * 60 / 10000); - Integer share_amount = v - dChargeFee.intValue(); - System.out.println("share value " + share_amount); - } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index eb9358d6f..1ec3a1d08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -21,6 +21,7 @@ import com.iformall.pay.WxPayment; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxSubsidyService; import com.iformall.utils.BeanUtils; +import com.iformall.utils.PayUtils; import com.iformall.utils.Utility; import com.iformall.utils.XmlUtil; import org.apache.commons.lang3.StringUtils; @@ -113,8 +114,8 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { record.setPayTimeEnd(curDate); record.setAmount(totalFee); // 分账金额 - Double dChargeFee = Math.ceil(record.getAmount() * 1.0D * payAccount.getRate() / 10000); - Integer share_amount = record.getAmount() - dChargeFee.intValue(); + int iChargeFee = PayUtils.getPayRate(record.getAmount(), payAccount.getRate()); + Integer share_amount = record.getAmount() - iChargeFee; record.setShareAmount(share_amount); record.setShareRemainAmount(share_amount); try { diff --git a/mallinkService/src/main/java/com/iformall/utils/PayUtils.java b/mallinkService/src/main/java/com/iformall/utils/PayUtils.java new file mode 100755 index 000000000..d7ea670ba --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/utils/PayUtils.java @@ -0,0 +1,50 @@ +package com.iformall.utils; + +/** + * 分账手续费 + * + * @author stormeye.wu + * @email wuguoqiang@iformall.com + * @date 2019年1月5月 + */ +public class PayUtils { + + /** + * getPayRate + * @param payAmount 支付总钱数(分) + * @param rate 万分之几 + * @return + */ + public static int getPayRate(int payAmount, int rate) { + Double dBaseAmount = 5.0D * 1000 / rate; + // 基础分 千分之6 83分 + if(payAmount > dBaseAmount.intValue()) { + // 大于基础分,不小于他的最小整数 + Double dChargeFee = Math.ceil(payAmount * 1.0D * rate / 10000); + return dChargeFee.intValue(); + } else { + // 小于基础分,四舍五入 + Double dPayRate = 1.0D * payAmount * rate / 10000; + long dChargeFee = Math.round(dPayRate); + return Long.valueOf(dChargeFee).intValue(); + } + } + + public static void main(String[] args) { + int iValue = getPayRate(100, 60); + System.out.println(iValue); + + iValue = getPayRate(200, 60); + System.out.println(iValue); + + iValue = getPayRate(82, 60); + System.out.println(iValue); + + iValue = getPayRate(83, 60); + System.out.println(iValue); + + iValue = getPayRate(84, 60); + System.out.println(iValue); + } + +} diff --git a/mallinkSysAdmin/src/main/java/com/iformall/utils/PayUtil.java b/mallinkSysAdmin/src/main/java/com/iformall/utils/PayUtil.java deleted file mode 100644 index 9776aad04..000000000 --- a/mallinkSysAdmin/src/main/java/com/iformall/utils/PayUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.iformall.utils; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; - -import java.awt.image.BufferedImage; -import java.util.Hashtable; -import java.util.Map; - -public class PayUtil { - /** - * 根据url生成二位图片对象 - * - * @param codeUrl - * @return - * @throws WriterException - */ - public static BufferedImage getQRCodeImge(String codeUrl) throws WriterException { - Map hints = new Hashtable(); - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); - hints.put(EncodeHintType.CHARACTER_SET, "UTF8"); - int width = 256; - BitMatrix bitMatrix = (new MultiFormatWriter()).encode(codeUrl, BarcodeFormat.QR_CODE, width, width, hints); - BufferedImage image = new BufferedImage(width, width, 1); - for(int x = 0; x < width; ++x) { - for(int y = 0; y < width; ++y) { - image.setRGB(x, y, bitMatrix.get(x, y) ? -16777216 : -1); - } - } - - return image; - } -} From 69ac8e41584f0668506ccd230cffcd35c9a68fc0 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 21 Jun 2019 14:12:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=80=9A=E9=81=93=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906211405__CHANGE_PAY_RATE.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql new file mode 100644 index 000000000..80de372e9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql @@ -0,0 +1,12 @@ +ALTER TABLE `wx_pay_order` +ADD COLUMN `rate_amount` int(11) NULL DEFAULT NULL COMMENT '分账实际通道费'; + +ALTER TABLE `wx_pay_account` +ADD COLUMN `real_rate` int(6) NULL DEFAULT NULL COMMENT '支付实际费率(万分之几)' after `rate`; + +update `wx_pay_account` set `real_rate` = `rate`; + +ALTER TABLE `wx_pay_account_bill` +ADD COLUMN `real_rate` int(6) NULL DEFAULT NULL COMMENT '支付实际费率(万分之几)' after `rate`; + +update `wx_pay_account_bill` set `real_rate` = `rate`; \ No newline at end of file From 6c7363d21d6f8015ea621067fdde390ebbfdaa8f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 21 Jun 2019 14:51:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E9=80=9A=E9=81=93=E8=B4=B9=E5=B7=AE?= =?UTF-8?q?=E8=AE=B0=E5=85=A5=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql index 80de372e9..e950c83d7 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906211405__CHANGE_PAY_RATE.sql @@ -1,5 +1,5 @@ ALTER TABLE `wx_pay_order` -ADD COLUMN `rate_amount` int(11) NULL DEFAULT NULL COMMENT '分账实际通道费'; +ADD COLUMN `rate_amount` int(11) NULL DEFAULT NULL COMMENT '分账通道费差'; ALTER TABLE `wx_pay_account` ADD COLUMN `real_rate` int(6) NULL DEFAULT NULL COMMENT '支付实际费率(万分之几)' after `rate`;