Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_real_202010

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
cf9807b394
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.WxCardVo;
import com.iformall.enums.EnumMerchantSubsidySource;
import com.iformall.enums.EnumMerchantSubsidyType;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCardInfoService;
import com.iformall.service.WxCardSpendService;
@@ -109,6 +110,7 @@ public class WxCardPayController extends BaseController {
List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources);
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize);
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")
private String ouPhone;
@io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone")
@io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="sources")
@TableField(exist = false)
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=")">
#{sourceItem}
</foreach>
</if>
</if>
<if test=" null != subsidyType ">
and ms.type = #{subsidyType}
</if>

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


Загрузка…
Отмена
Сохранить