Browse Source

[线上交易][修改][导出]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
34887bcced
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java View File

@@ -122,7 +122,7 @@ public class WxOrder extends BaseEntity {
}

public String getPaymentStr() {
return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : payStr;
return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : paymentStr;
}

@Excel(name = "订单金额(元)", width = 20, orderNum = "6")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java View File

@@ -83,7 +83,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
Long subsidy = summary.get("subsidy");
String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString();
WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo();
merchantSubsidy.setSubsidyStr(subsidyStr);
merchantSubsidy.setSubsidyStr("承付总金额(元): " + subsidyStr);
merchantSubsidy.setSource(-1);
merchantSubsidy.setType(-1);
merchantSubsidy.setFreeze(-1);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -1058,8 +1058,8 @@ public class WxOrderServiceImpl implements WxOrderService {
String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString();
String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString();
WxOrder order = new WxOrder();
order.setPayStr(payStr);
order.setPaymentStr(paymentStr);
order.setPayStr("支付总金额(元): " + payStr);
order.setPaymentStr("订单总金额(元): " + paymentStr);
order.setOrderStatus(-1);
order.setAttribute(-1);
list.add(order);


Loading…
Cancel
Save