| @@ -211,8 +211,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| wxMerchantShop.setUpdateDate(shopdate); | wxMerchantShop.setUpdateDate(shopdate); | ||||
| wxMerchantShop.setCreateDate(shopdate); | wxMerchantShop.setCreateDate(shopdate); | ||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); | |||||
| wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); | |||||
| //wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); | |||||
| //wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); | |||||
| wxMerchantShopMapper.insertSelective(wxMerchantShop); | wxMerchantShopMapper.insertSelective(wxMerchantShop); | ||||
| //更新商铺状态 | //更新商铺状态 | ||||
| @@ -388,7 +388,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| wxBillRent.setRentContractId(wxRentContract.getId()); | wxBillRent.setRentContractId(wxRentContract.getId()); | ||||
| wxBillRent.setReceivePay(0); | wxBillRent.setReceivePay(0); | ||||
| wxBillRent.setPay(0); | wxBillRent.setPay(0); | ||||
| int needpay = wxRentContract.getPrice() * i; | |||||
| int needpay = wxRentContract.getPrice(); | |||||
| wxBillRent.setNeedPay(needpay); | wxBillRent.setNeedPay(needpay); | ||||
| wxBillRent.setOwe(needpay); | wxBillRent.setOwe(needpay); | ||||