Преглед изворни кода

[商户管理][修改][添加商户后添加账单]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
7456f34eb9
1 измењених фајлова са 8 додато и 10 уклоњено
  1. +8
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 8
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Прегледај датотеку

@@ -94,15 +94,6 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<Map<String, Object>> shops = new ArrayList<>(); 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); List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop);
for (WxMerchantShop merchantShop : wxMerchantShopList) { for (WxMerchantShop merchantShop : wxMerchantShopList) {
wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate());
@@ -122,6 +113,13 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setbUsers(bUserList); wxMerchant.setbUsers(bUserList);

//分账信息
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant);
wxMerchant.setAccountId(receiver.getReceiverAccount());
wxMerchant.setAccountName(receiver.getTrueName());
wxMerchant.setAccountTypeValue(receiver.getReceiverType());

return wxMerchant; return wxMerchant;
} }


@@ -198,7 +196,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchant.setCreateDate(date); wxMerchant.setCreateDate(date);
wxMerchantMapper.insertSelective(wxMerchant); wxMerchantMapper.insertSelective(wxMerchant);


//buildRent(wxRentContract,wxShopP);
buildRent(wxMerchant);


//保存商户商铺的关联 //保存商户商铺的关联
List<Long> shopidlist = wxMerchant.getShopids(); List<Long> shopidlist = wxMerchant.getShopids();


Loading…
Откажи
Сачувај