lrh 2 лет назад
Родитель
Сommit
a8d357ed3a
2 измененных файлов: 12 добавлений и 16 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +11
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -103,6 +103,7 @@ public class WxMerchantController extends BaseController {
@PostMapping("saveOrUpdate")
@SystemControllerLog(description = "区域商户和普通商户关系新增或更新")
public ResultData saveOrUpdate(@RequestBody WxMerchantRelation wxMerchantRelation) {
logger.debug(getTenantInfo().toString());
logger.debug("[" + getIpAddr() + "] WxMerchantController::saveOrUpdate");
if (null == wxMerchantRelation) wxMerchantRelation = new WxMerchantRelation();
wxMerchantRelation.updateTenantInfo(getTenantInfo());


+ 11
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java Просмотреть файл

@@ -63,25 +63,20 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService
wxMerchantRelationMapper.updateByMerchantIds(updateList,regionId);
}
if (!CollectionUtils.isEmpty(insertList)) {
insertInfo(regionId, insertList, tenantId);
}
return new ResultData(Result.SUCCESS, "编辑成功", null);
}

public void insertInfo(Long regionId, List<Long> ids, String tenantId) {
List<WxMerchantRelation> list = new ArrayList<>();
for (Long id : ids) {
WxMerchantRelation relation = new WxMerchantRelation();
relation.setId(IdWorker.get().nextId());
relation.setMerchantId(id);
relation.setRegionMerchantId(regionId);
relation.setTenantId(tenantId);
list.add(relation);
List<WxMerchantRelation> list = new ArrayList<>();
for (Long id : ids) {
WxMerchantRelation relation = new WxMerchantRelation();
relation.setId(IdWorker.get().nextId());
relation.setMerchantId(id);
relation.setRegionMerchantId(regionId);
relation.setTenantId(tenantId);
list.add(relation);
}
wxMerchantRelationMapper.insertBatch(list);
}
wxMerchantRelationMapper.insertBatch(list);
return new ResultData(Result.SUCCESS, "成功", null);
}


@Override
public void deleteByMerchantId(Long merchantId) {
wxMerchantRelationMapper.deleteByMerchantId(merchantId);


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