Parcourir la source

fix card

release_toaliyun_real
lin il y a 3 ans
Parent
révision
5ab741f3d4
3 fichiers modifiés avec 19 ajouts et 2 suppressions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  3. +6
    -1
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml

+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java Voir le fichier

@@ -29,7 +29,8 @@ public class WxCardSpend extends TenantEntity {
private List<Long> ownerIdList;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;

@TableField(exist = false)
private List<Long> merchantIdList;
@Excel(name = "订单号", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId")
private Long orderId;


+ 11
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Voir le fichier

@@ -601,6 +601,17 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
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


+ 6
- 1
mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml Voir le fichier

@@ -97,7 +97,12 @@
<if test="null != enddate">
and `create_date` &lt;= #{enddate}
</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 ">
and `pay_status` in
<foreach collection="payStatusS" index="index" item="psItem" open="(" separator="," close=")">


Chargement…
Annuler
Enregistrer