Explorar el Código

[营销结算][修改][查询及导出]

release_toaliyun_real
gongbiao hace 6 años
padre
commit
899e7c11d6
Se han modificado 3 ficheros con 3 adiciones y 2 borrados
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java Ver fichero

@@ -74,7 +74,7 @@ public class WxMerchantSubsidy extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy")
private Integer realSubsidy; private Integer realSubsidy;


@Excel(name = "结算状态", width = 20, orderNum = "7", replace = {"未结算_0", "已结算_1", "已结算_2"})
@Excel(name = "结算状态", width = 20, orderNum = "7", replace = {"未结算_0", "已结算_1", "已结算_2", " _-1"})
@io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴, 2:已手工补贴)",name="status") @io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴, 2:已手工补贴)",name="status")
private Integer status; private Integer status;




+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java Ver fichero

@@ -88,6 +88,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
merchantSubsidy.setSource(-1); merchantSubsidy.setSource(-1);
merchantSubsidy.setType(-1); merchantSubsidy.setType(-1);
merchantSubsidy.setFreeze(-1); merchantSubsidy.setFreeze(-1);
merchantSubsidy.setStatus(-1);
list.add(merchantSubsidy); list.add(merchantSubsidy);
excelService.exportExcel(list, null, "结算记录", WxMerchantSubsidyVo.class, "结算记录.xlsx", response, false); excelService.exportExcel(list, null, "结算记录", WxMerchantSubsidyVo.class, "结算记录.xlsx", response, false);
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml Ver fichero

@@ -254,7 +254,7 @@
</if> </if>
<if test=" null != status"> <if test=" null != status">
<choose> <choose>
<when test="status=0">
<when test="status==0">
and ms.`status` = #{status} and ms.`status` = #{status}
</when> </when>
<otherwise> <otherwise>


Cargando…
Cancelar
Guardar