|
|
|
@@ -94,15 +94,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); |
|
|
|
List<Map<String, Object>> shops = new ArrayList<>(); |
|
|
|
|
|
|
|
// WxRentContract wxRentContract = new WxRentContract(); |
|
|
|
// wxRentContract.setMerchantId(id); |
|
|
|
// List<WxRentContract> list = wxRentContractMapper.findList(wxRentContract); |
|
|
|
// if(list.size()>0){ |
|
|
|
// wxRentContract=list.get(0); |
|
|
|
// wxMerchant.setPrice(wxRentContract.getPrice()); |
|
|
|
// wxMerchant.setReceivePeriod(wxRentContract.getReceivePeriod()); |
|
|
|
// } |
|
|
|
|
|
|
|
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); |
|
|
|
for (WxMerchantShop merchantShop : wxMerchantShopList) { |
|
|
|
wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); |
|
|
|
@@ -122,6 +113,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
|
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); |
|
|
|
wxMerchant.setbUsers(bUserList); |
|
|
|
|
|
|
|
//分账信息 |
|
|
|
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); |
|
|
|
wxMerchant.setAccountId(receiver.getReceiverAccount()); |
|
|
|
wxMerchant.setAccountName(receiver.getTrueName()); |
|
|
|
wxMerchant.setAccountTypeValue(receiver.getReceiverType()); |
|
|
|
|
|
|
|
return wxMerchant; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -198,7 +196,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchant.setCreateDate(date); |
|
|
|
wxMerchantMapper.insertSelective(wxMerchant); |
|
|
|
|
|
|
|
//buildRent(wxRentContract,wxShopP); |
|
|
|
buildRent(wxMerchant); |
|
|
|
|
|
|
|
//保存商户商铺的关联 |
|
|
|
List<Long> shopidlist = wxMerchant.getShopids(); |
|
|
|
|