winter 1 год назад
Родитель
Сommit
9fe8333eea
12 измененных файлов: 141 добавлений и 46 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  2. +103
    -0
      mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql
  3. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java
  5. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  6. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java
  7. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  8. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  9. +0
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  10. +22
    -19
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  11. +1
    -3
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
  12. +4
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

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

@@ -137,8 +137,7 @@ public class WxShopController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber");
WxShop wxShop = new WxShop();
wxShop.setShopNumber(shopNumber);
wxShop.setType(type);

//wxShop.setType(type);
wxShop.setId(id);
wxShop.updateTenantInfo(getTenantInfo());
return wxShopService.hasShopNumber(wxShop);


+ 103
- 0
mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql Просмотреть файл

@@ -1,3 +1,106 @@
INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`)
VALUES (213, '写字楼住宅', 201, 'Y', NULL, 1, NULL, NULL, 'xzlzzlist', NULL, 0, 213);

ALTER TABLE wx_merchant DROP COLUMN TYPE;

ALTER TABLE wx_finance_receive_0 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_1 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_2 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_3 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_4 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_5 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_6 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_7 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_8 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_9 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_10 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_11 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_12 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_13 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_14 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_15 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_16 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_17 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_18 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_19 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_20 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_21 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_22 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_23 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_24 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_25 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_26 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_27 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_28 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_29 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_30 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_31 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_32 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_33 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_34 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_35 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_36 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_37 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_38 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_39 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_40 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_41 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_42 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_43 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_44 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_45 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_46 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_47 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_48 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_49 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_50 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_51 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_52 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_53 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_54 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_55 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_56 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_57 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_58 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_59 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_60 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_61 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_62 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_63 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_64 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_65 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_66 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_67 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_68 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_69 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_70 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_71 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_72 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_73 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_74 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_75 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_76 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_77 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_78 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_79 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_80 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_81 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_82 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_83 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_84 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_85 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_86 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_87 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_88 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_89 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_90 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_91 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_92 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_93 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_94 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_95 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_96 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_97 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_98 DROP COLUMN rent_shop_type;
ALTER TABLE wx_finance_receive_99 DROP COLUMN rent_shop_type;


+ 0
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java Просмотреть файл

@@ -42,10 +42,6 @@ public class WxAllBill extends TenantEntity {
@TableField(exist = false)
public String merchantName;
@Excel(name = "租赁商铺类型*", orderNum = "6", width = 20, replace = {"店铺_1", "多经点位_2"})
@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
public Integer rentShopType;

@Excel(name = "制单时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
public Date createtime;


+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java Просмотреть файл

@@ -91,7 +91,6 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity {
daily.setId(idWorker.nextId());
daily.updateTenantInfo(this);
daily.setMerchantId(merchant.getId());
daily.setRentShopType(shop.getType());
daily.setCreatetime(new Date());
daily.setCreateBy(user.getId());
daily.setCreateByName(user.getName());


+ 10
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumRentShopType;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -118,6 +120,14 @@ public class WxShop extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type")
private Integer type;
@TableField(exist = false)
private String typeName;
public String getTypeName() {
if (null != type) {
return EnumRentShopType.getEnum(type).getMessage();
}
return null;
}

@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;


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

@@ -832,9 +832,6 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
@Override
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxAllBill wxBillRent) {
String billName = "账单";
if (null != wxBillRent.getRentShopType()) {
billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单";
}
PageInfo<WxAllBill> billRentList = listAsPage(wxBillRent,1,10000);
List<WxAllBill> datalist = new ArrayList<WxAllBill>();
if (null != billRentList && null != billRentList.getList()) {


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

@@ -1216,7 +1216,6 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxAllBill advanceBill = new WxAllBill();
advanceBill.updateTenantInfo(record);
advanceBill.setMerchantId(merchant.getId());
advanceBill.setRentShopType(merchant.getRentShopType());
advanceBill.setNeedPay(record.getReceivePay());
advanceBill.setReceivePay(receivePay);
advanceBill.setPay(pay);


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

@@ -316,7 +316,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
bill.setUpdatetime(date);
bill.setUpdateBy(user.getId());
bill.setUpdateByName(user.getName());
bill.setRentShopType(record.getRentShopType());
bill.setIsPreview(EnumIsPreview.YES.getCode());
bill.setShopInfo(getShopInfoStr(record));
bill.setPay("0");
@@ -571,7 +570,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillDeposit.setUpdatetime(date);
//wxBillDeposit.setUpdateBy(user.getId());
//wxBillDeposit.setUpdateByName(user.getName());
wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType());
wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract));
wxBillDeposit.setShopNumber(wxPropertyContract.getShopNumbers());
wxBillDeposit.setRentArea(wxPropertyContract.getRentArea());
@@ -875,7 +873,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillProperty.setUpdateBy(user.getId());
wxBillProperty.setUpdateByName(user.getName());
//wxBillProperty.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillProperty.setRentShopType(wxPropertyContract.getRentShopType());
//wxBillProperty.setPeriod(billcount);
if (shopInfo != null) {
wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo));


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

@@ -553,7 +553,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setOperatingManageFeeNeedPay(bill.getOperatingManageFeeNeedPay());
bill.setUpdatetime(date); bill.setUpdateBy(user.getId());
bill.setUpdateByName(user.getName());
bill.setRentShopType(record.getRentShopType());
//bill.setPeriod(count);
bill.setIsPreview(EnumIsPreview.YES.getCode());
bill.setShopInfo(getShopInfoStr(record));
@@ -636,7 +635,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setUpdatetime(date);
bill.setUpdateBy(user.getId());
bill.setUpdateByName(user.getName());
bill.setRentShopType(record.getRentShopType());
//bill.setPeriod(count);
bill.setShopInfo(getShopInfoStr(record));
//bill.setLatePayRatio(0);
@@ -871,7 +869,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setUpdateByName(user.getName());
}
//wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillDeposit.setRentShopType(wxRentContract.getRentShopType());
if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) {
String rentInfo = wxRentContract.getRentInfo();
if (rentInfo != null) {
@@ -1297,7 +1294,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setIsPreview(isPreview);
wxBillRent.setId(idWorker.nextId());
wxBillRent.setRentContractId(wxRentContract.getId());
wxBillRent.setRentShopType(wxRentContract.getRentShopType());
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
wxBillRent.setPay("0");
wxBillRent.setStarttime(billTimeVo.getStartDate());
@@ -1333,7 +1329,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());;
//wxBillRent.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillRent.setRentShopType(wxRentContract.getRentShopType());
//wxBillRent.setPeriod(++billcount);
wxBillRent.setShopInfo(shopInfoStr);
//wxBillRent.setLatePayRatio(0);
@@ -1387,7 +1382,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
manage.setUpdateBy(wxBillRent.getUpdateBy());
manage.setUpdatetime(wxBillRent.getUpdatetime());
manage.setUpdateByName(wxBillRent.getUpdateByName());
manage.setRentShopType(wxBillRent.getRentShopType());
manage.setRentArea(wxBillRent.getRentArea());
manage.setShopNumber(wxBillRent.getShopNumber());
manage.setCanEdit(EnumYesOrNo.NO.getCode());
@@ -2753,7 +2747,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
@@ -2800,7 +2793,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
@@ -2831,7 +2823,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");


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

@@ -363,25 +363,28 @@ public class WxShopServiceImpl implements WxShopService {
WxMerchant merchant = new WxMerchant();
merchant.updateTenantInfo(record);
merchant.setName("[系统]"+record.getShopNumber());
merchant.setId(idWorker.nextId());
merchant.setLinkPerson("虚拟");
merchant.setLinkPhone("11111111111");
merchant.setStatus(EnumMerchantStatus.VALID.getCode());
merchant.setCreateDate(new Date());
merchant.setUpdateDate(new Date());
merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode());
merchant.setIsPrivate(EnumYesOrNo.YES.getCode());
merchant.setBillSetting(3);
merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode());
merchant.setCreateFromId(String.valueOf(record.getId()));
merchant.setCarVendorType(0);
merchant.setBusinessId(com.iformall.utils.Constant.default_business);
//merchant.setType();
merchant.setIsAdmin(EnumYesOrNo.NO.getCode());
merchant.setIsDel(EnumYesOrNo.NO.getCode());
merchant.setSearchCardByPhone(EnumYesOrNo.NO.getCode());
merchant.setCreditLocked(EnumYesOrNo.NO.getCode());
wxMerchantMapper.insert(merchant);
int count = wxMerchantMapper.hasMerchant(merchant);
if (count <= 0 ) {
merchant.setId(idWorker.nextId());
merchant.setLinkPerson("虚拟");
merchant.setLinkPhone("11111111111");
merchant.setStatus(EnumMerchantStatus.VALID.getCode());
merchant.setCreateDate(new Date());
merchant.setUpdateDate(new Date());
merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode());
merchant.setIsPrivate(EnumYesOrNo.YES.getCode());
merchant.setBillSetting(3);
merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode());
merchant.setCreateFromId(String.valueOf(record.getId()));
merchant.setCarVendorType(0);
merchant.setBusinessId(com.iformall.utils.Constant.default_business);
//merchant.setType();
merchant.setIsAdmin(EnumYesOrNo.NO.getCode());
merchant.setIsDel(EnumYesOrNo.NO.getCode());
merchant.setSearchCardByPhone(EnumYesOrNo.NO.getCode());
merchant.setCreditLocked(EnumYesOrNo.NO.getCode());
wxMerchantMapper.insert(merchant);
}
WxMerchantShop ms = new WxMerchantShop();
ms.updateTenantInfo(record);


+ 1
- 3
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -6,7 +6,6 @@
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/>
<result column="createtime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="create_by" jdbcType="BIGINT" property="createBy"/>
<result column="create_by_name" jdbcType="VARCHAR" property="createByName"/>
@@ -49,7 +48,7 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`rent_shop_type`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`,
`id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`,
`price_detail`,`need_pay`,`receive_pay`,`pay`,`bill_type`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,`return_pay`,
`bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`,`receive_date`,
`is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`,
@@ -61,7 +60,6 @@
<if test=" null != id ">and `id` = #{id}</if>
<if test=" null != parentTenantId and '' != parentTenantId"> and `parent_tenant_id` = #{parentTenantId}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != createBy ">and `create_by` = #{createBy}</if>
<if test=" null != createByName and '' != createByName"> and `create_by_name` like concat('%',#{createByName},'%')</if>
<if test=" null != billType ">and `bill_type` = #{billType}</if>


+ 4
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -544,8 +544,11 @@
<select id="hasShopNumber" parameterType="com.iformall.domain.po.WxShop" resultType="Integer">
select count(1) from wx_shop where shop_number=#{shopNumber} and `type`=#{type}
select count(1) from wx_shop where shop_number=#{shopNumber}
and is_del=0
<if test=" null != type">
and `type`=#{type}
</if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>


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