|
|
|
@@ -1,19 +1,11 @@ |
|
|
|
package com.simple.service.impl; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.simple.common.IdWorker; |
|
|
|
import com.simple.common.ResultData; |
|
|
|
import com.simple.domain.po.WxMerchant; |
|
|
|
import com.simple.domain.po.WxMerchantBUser; |
|
|
|
import com.simple.domain.po.WxMerchantShop; |
|
|
|
import com.simple.domain.po.WxShop; |
|
|
|
import com.simple.domain.po.*; |
|
|
|
import com.simple.enums.EnumCarVendor; |
|
|
|
import com.simple.mapper.WxMerchantBUserMapper; |
|
|
|
import com.simple.mapper.WxMerchantMapper; |
|
|
|
import com.simple.mapper.WxMerchantShopMapper; |
|
|
|
import com.simple.mapper.WxShopMapper; |
|
|
|
import com.simple.mapper.*; |
|
|
|
import com.simple.service.WxMerchantService; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
@@ -22,8 +14,6 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
@@ -40,6 +30,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
@Autowired |
|
|
|
WxMerchantBUserMapper wxMerchantBUserMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxAppinfoMapper wxAppinfoMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); |
|
|
|
@@ -91,6 +84,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
@Override |
|
|
|
public void saveOrUpdate(WxMerchant wxMerchant) { |
|
|
|
|
|
|
|
WxAppinfo wxAppinfo = new WxAppinfo(); |
|
|
|
wxAppinfo.setTenantId(wxMerchant.getTenantId()); |
|
|
|
wxAppinfo.setType(1); |
|
|
|
wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); |
|
|
|
|
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
long merchantid = idWorker.nextId(); |
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
@@ -170,6 +168,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//删除之前的关联用户 |
|
|
|
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); |
|
|
|
|
|
|
|
@@ -183,6 +184,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
user.setId(id); |
|
|
|
user.setBUserId(id); |
|
|
|
user.setMerchantId(merchantid); |
|
|
|
user.setTenantId(wxMerchant.getTenantId()); |
|
|
|
user.setAppId(wxAppinfo.getAppId()); |
|
|
|
Date date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
|