Browse Source

Merge branch 'release_toaliyun_real_20230315' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230315

release_toaliyun_real
xhxu 3 years ago
parent
commit
63ffe27ad0
3 changed files with 28 additions and 6 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java
  3. +26
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java View File

@@ -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<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java View File

@@ -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(",")


+ 26
- 4
mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java View File

@@ -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;
}
}

Loading…
Cancel
Save