| @@ -29,7 +29,8 @@ public class WxCardSpend extends TenantEntity { | |||||
| private List<Long> ownerIdList; | private List<Long> ownerIdList; | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @TableField(exist = false) | |||||
| private List<Long> merchantIdList; | |||||
| @Excel(name = "订单号", width = 20, orderNum = "5") | @Excel(name = "订单号", width = 20, orderNum = "5") | ||||
| @io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| @@ -601,6 +601,17 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| record.setOwnerIdList(uids); | record.setOwnerIdList(uids); | ||||
| } | } | ||||
| } | } | ||||
| if (StringUtils.isNotBlank(record.getMerchantName())){ | |||||
| WxMerchant merchantQ = new WxMerchant(); | |||||
| merchantQ.updateTenantInfo(record); | |||||
| merchantQ.setName(record.getMerchantName()); | |||||
| List<Long> merchantIds = wxMerchantMapper.findIdList(merchantQ); | |||||
| if (null == merchantIds || merchantIds.size() <=0 ){ | |||||
| record.setId(-999L); | |||||
| }else { | |||||
| record.setMerchantIdList(merchantIds); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -97,7 +97,12 @@ | |||||
| <if test="null != enddate"> | <if test="null != enddate"> | ||||
| and `create_date` <= #{enddate} | and `create_date` <= #{enddate} | ||||
| </if> | </if> | ||||
| <if test=" null != merchantIdList "> | |||||
| and `merchant_id` in | |||||
| <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> | |||||
| #{midItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != payStatusS "> | <if test=" null != payStatusS "> | ||||
| and `pay_status` in | and `pay_status` in | ||||
| <foreach collection="payStatusS" index="index" item="psItem" open="(" separator="," close=")"> | <foreach collection="payStatusS" index="index" item="psItem" open="(" separator="," close=")"> | ||||