diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 25daf3e0b..731e9718f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -86,7 +86,7 @@ public class WxCardPayController extends BaseController { wxCardVo.setStatusS(tmpList); } } - wxCardVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + wxCardVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_ASC); final PageInfo page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index c9ddec0aa..589d6bb5e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -124,7 +124,7 @@ public class WxCouponPasswordController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData batchList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { wxCouponPassword.updateTenantInfo(getTenantInfo()); - wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_ASC); StringBuffer statussb = new StringBuffer(); statussb.append(EnumCouponPasswordStatus.MSG_SENDED.getCode()).append(",") .append(EnumCouponPasswordStatus.MSG_SENDING.getCode()).append(",") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java index bc69bd31c..6de03e079 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java @@ -16,16 +16,38 @@ public class WxCardSpendMerchantVo { private BigDecimal total; @Excel(name = "交易总金额(元)", width = 20, orderNum = "3") private String totalStr; - @Excel(name = "总手续费(分)", width = 20, orderNum = "4") private BigDecimal fee; - @Excel(name = "总补贴(分)", width = 20, orderNum = "5") + @Excel(name = "总手续费(元)", width = 20, orderNum = "4") + private String feeStr; private BigDecimal subsidy; + @Excel(name = "总补贴(元)", width = 20, orderNum = "5") + private String subsidyStr; - public void setTotalStr() { + public String getTotalStr() { if (null != total) { this.totalStr = total.divide(new BigDecimal(100)).toString(); + }else { + this.totalStr = "0"; } - this.totalStr = "0"; + return this.totalStr; + } + + public String getFeeStr() { + if (null != fee) { + this.feeStr = fee.divide(new BigDecimal(100)).toString(); + }else { + this.feeStr = "0"; + } + return this.feeStr; + } + + public String getSubsidyStr() { + if (null != subsidy) { + this.subsidyStr = subsidy.divide(new BigDecimal(100)).toString(); + }else { + this.subsidyStr = "0"; + } + return this.subsidyStr; } }