Преглед изворни кода

fix bug

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
300c1af938
3 измењених фајлова са 12 додато и 2 уклоњено
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java
  3. +5
    -1
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java Прегледај датотеку

@@ -11,6 +11,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardSpendVo;
import com.iformall.domain.vo.WxCardVo; import com.iformall.domain.vo.WxCardVo;
import com.iformall.enums.EnumMerchantSubsidySource; import com.iformall.enums.EnumMerchantSubsidySource;
import com.iformall.enums.EnumMerchantSubsidyType;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardInfoService;
import com.iformall.service.WxCardSpendService; import com.iformall.service.WxCardSpendService;
@@ -109,6 +110,7 @@ public class WxCardPayController extends BaseController {
List<Integer> sources = new ArrayList<Integer>(); List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode()); sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources); wxCardSpendVo.setSources(sources);
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java Прегледај датотеку

@@ -40,8 +40,12 @@ public class WxCardSpendVo extends WxCardSpend {
@io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone")
private String ouPhone; private String ouPhone;
@io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone")
@io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="sources")
@TableField(exist = false) @TableField(exist = false)
private List<Integer> sources; private List<Integer> sources;
@io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType")
@TableField(exist = false)
private Integer subsidyType;


} }

+ 5
- 1
mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml Прегледај датотеку

@@ -391,7 +391,11 @@
<foreach collection="sources" index="index" item="sourceItem" open="(" separator="," close=")"> <foreach collection="sources" index="index" item="sourceItem" open="(" separator="," close=")">
#{sourceItem} #{sourceItem}
</foreach> </foreach>
</if>
</if>
<if test=" null != subsidyType ">
and ms.type = #{subsidyType}
</if>


<if test=" null != ouPhone and '' != ouPhone "> <if test=" null != ouPhone and '' != ouPhone ">
and ou.`phone` = #{ouPhone} and ou.`phone` = #{ouPhone}


Loading…
Откажи
Сачувај