Explorar el Código

[积分][修改]:积分况换停车券不显示消费商户的问题

release_toaliyun_real
hanxueda hace 7 años
padre
commit
b2e84ca2c5
Se han modificado 2 ficheros con 14 adiciones y 0 borrados
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java Ver fichero

@@ -22,6 +22,8 @@ public class WxCreditHistory implements Serializable {
protected List<Long> ids; protected List<Long> ids;
@Transient @Transient
protected String sortColumns; protected String sortColumns;
@Transient
protected List<Long> merchantIds;


@Transient @Transient
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime")


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Ver fichero

@@ -189,6 +189,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
record.setCreateDate(new Date()); record.setCreateDate(new Date());
//根据merchantIds判断券对应的商户是否为多商户 来赋值merchantId
setMerchantId(record);
wxCreditHistoryMapper.insertSelective(record); wxCreditHistoryMapper.insertSelective(record);
//将计算出来新的总积分 更新到两张用户表里 //将计算出来新的总积分 更新到两张用户表里
if (wxCUser != null) { if (wxCUser != null) {
@@ -210,6 +212,16 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return record; 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 @Override
public void deleteById(Long id) { public void deleteById(Long id) {
wxCreditHistoryMapper.deleteByPrimaryKey(id); wxCreditHistoryMapper.deleteByPrimaryKey(id);


Cargando…
Cancelar
Guardar