diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index d1d54bf39..e75ccef51 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -22,6 +22,8 @@ public class WxCreditHistory implements Serializable { protected List ids; @Transient protected String sortColumns; + @Transient + protected List merchantIds; @Transient @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 5b03c2c0b..09d97174d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -189,6 +189,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); + //根据merchantIds判断券对应的商户是否为多商户 来赋值merchantId + setMerchantId(record); wxCreditHistoryMapper.insertSelective(record); //将计算出来新的总积分 更新到两张用户表里 if (wxCUser != null) { @@ -210,6 +212,16 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return record; } + private void setMerchantId(WxCreditHistory record) { + if (record.getMerchantIds() != null && record.getMerchantIds().size() > 0) { + if (record.getMerchantIds().size() == 1) { + record.setMerchantId(record.getMerchantIds().get(0)); + } else { + record.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode())); + } + } + } + @Override public void deleteById(Long id) { wxCreditHistoryMapper.deleteByPrimaryKey(id);