| @@ -0,0 +1,23 @@ | |||||
| ALTER TABLE `wx_bill_rent` | |||||
| ADD COLUMN `contract_need_pay` bigint(12) COMMENT '原合同应收金额' AFTER `is_del`, | |||||
| ADD COLUMN `rent_price_info` json COMMENT '合同应收明细' AFTER `contract_need_pay`; | |||||
| ALTER TABLE `wx_bill_daily` | |||||
| ADD COLUMN `shop_name` varchar(500) COMMENT '商铺编号' AFTER `shop_id`; | |||||
| ALTER TABLE `wx_bill_other` | |||||
| ADD COLUMN `shop_name` varchar(500) COMMENT '商铺' AFTER `shop_id`; | |||||
| ALTER TABLE `wx_bill_other_deposit` | |||||
| ADD COLUMN `shop_name` varchar(500) COMMENT '商铺' AFTER `shop_id`; | |||||
| @@ -65,6 +65,8 @@ public class WxBillDaily extends TenantEntity { | |||||
| private Long userId; | private Long userId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="商铺",name="shopName") | |||||
| private String shopName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| @@ -92,10 +94,7 @@ public class WxBillDaily extends TenantEntity { | |||||
| private Integer period; | private Integer period; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String shopNumber; | |||||
| @TableField(exist = false) | |||||
| private List<Map<String, Object>> shops; | |||||
| private WxMerchant merchant; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | ||||
| private Date starttime; | private Date starttime; | ||||
| @@ -93,8 +93,7 @@ public class WxBillOther extends TenantEntity { | |||||
| private Integer period; | private Integer period; | ||||
| @Excel(name = "商铺号", width = 20, orderNum = "1") | @Excel(name = "商铺号", width = 20, orderNum = "1") | ||||
| @TableField(exist = false) | |||||
| private String shopNumber; | |||||
| private String shopName; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @@ -125,7 +124,9 @@ public class WxBillOther extends TenantEntity { | |||||
| } | } | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Map<String, Object>> shops; | |||||
| private WxMerchant merchant; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") | @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") | ||||
| private Integer freeze; | private Integer freeze; | ||||
| @@ -96,8 +96,7 @@ public class WxBillOtherDeposit extends TenantEntity { | |||||
| private Integer period; | private Integer period; | ||||
| @Excel(name = "商铺号", width = 20, orderNum = "1") | @Excel(name = "商铺号", width = 20, orderNum = "1") | ||||
| @TableField(exist = false) | |||||
| private String shopNumber; | |||||
| private String shopName; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -125,6 +124,10 @@ public class WxBillOtherDeposit extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd") | @Excel(name = "退款日", orderNum = "7", width = 20, format = "yyyy-MM-dd") | ||||
| private Date returnDate; | private Date returnDate; | ||||
| @TableField(exist = false) | |||||
| private WxMerchant merchant; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Map<String, Object>> shops; | private List<Map<String, Object>> shops; | ||||
| @@ -200,4 +200,14 @@ public class WxBillProperty extends TenantEntity { | |||||
| public String getRealReceivePayStr() { | public String getRealReceivePayStr() { | ||||
| return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||||
| @TableField(exist = false) | |||||
| private Long building; | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||||
| @TableField(exist = false) | |||||
| private Long floor; | |||||
| } | } | ||||
| @@ -85,6 +85,12 @@ public class WxBillRent extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| @io.swagger.annotations.ApiModelProperty(value="原合同应收金额",name="contractNeedPay") | |||||
| private Long contractNeedPay; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo") | |||||
| private String rentPriceInfo; | |||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Long needPay; | private Long needPay; | ||||
| @@ -13,6 +13,7 @@ import com.iformall.domain.vo.WxBillDailyVo; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.mapper.WxBillDailyMapper; | import com.iformall.mapper.WxBillDailyMapper; | ||||
| import com.iformall.mapper.WxMerchantMapper; | |||||
| import com.iformall.mapper.WxMerchantShopMapper; | import com.iformall.mapper.WxMerchantShopMapper; | ||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| @@ -55,6 +56,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| @Autowired | @Autowired | ||||
| WxMerchantShopMapper wxMerchantShopMapper; | WxMerchantShopMapper wxMerchantShopMapper; | ||||
| @Autowired | @Autowired | ||||
| WxMerchantMapper wxMerchantMapper; | |||||
| @Autowired | |||||
| WxPayAccountBillService wxPayAccountBillService; | WxPayAccountBillService wxPayAccountBillService; | ||||
| @Override | @Override | ||||
| @@ -145,14 +148,15 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDaily); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDaily); | ||||
| computeTotalMoney(wxPayAccountBill, wxBillDaily); | computeTotalMoney(wxPayAccountBill, wxBillDaily); | ||||
| wxBillDaily.setOwe(wxBillDaily.getRealReceivePay() - wxBillDaily.getPay()); | wxBillDaily.setOwe(wxBillDaily.getRealReceivePay() - wxBillDaily.getPay()); | ||||
| if (wxBillDaily.getShopId() != null) { | |||||
| WxShop shop = new WxShop(); | |||||
| shop.setId(wxBillDaily.getShopId()); | |||||
| List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| wxBillDaily.setShops(shoplist); | |||||
| }else{ | |||||
| wxBillDaily.setShops(Collections.EMPTY_LIST); | |||||
| } | |||||
| wxBillDaily.setMerchant(wxMerchantMapper.selectById(wxBillDaily.getMerchantId())); | |||||
| // if (wxBillDaily.getShopId() != null) { | |||||
| // WxShop shop = new WxShop(); | |||||
| // shop.setId(wxBillDaily.getShopId()); | |||||
| // List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| // wxBillDaily.setShops(shoplist); | |||||
| // }else{ | |||||
| // wxBillDaily.setShops(Collections.EMPTY_LIST); | |||||
| // } | |||||
| return wxBillDaily; | return wxBillDaily; | ||||
| } | } | ||||
| @@ -377,7 +381,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| for (int i = 0, size = billDailyList.size(); i < size; i++) { | for (int i = 0, size = billDailyList.size(); i < size; i++) { | ||||
| WxBillDaily b = billDailyList.get(i); | WxBillDaily b = billDailyList.get(i); | ||||
| wxBillDailyExportVo = new WxBillDailyExportVo(); | wxBillDailyExportVo = new WxBillDailyExportVo(); | ||||
| wxBillDailyExportVo.setShopNumber(b.getShopNumber()); | |||||
| wxBillDailyExportVo.setShopNumber(b.getShopName()); | |||||
| wxBillDailyExportVo.setMerchantName(b.getMerchantName()); | wxBillDailyExportVo.setMerchantName(b.getMerchantName()); | ||||
| wxBillDailyExportVo.setReceivePay(b.getRealReceivePay()); | wxBillDailyExportVo.setReceivePay(b.getRealReceivePay()); | ||||
| wxBillDailyExportVo.setPay(b.getPay()); | wxBillDailyExportVo.setPay(b.getPay()); | ||||
| @@ -11,6 +11,7 @@ import com.iformall.domain.po.*; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.mapper.WxBillOtherDepositMapper; | import com.iformall.mapper.WxBillOtherDepositMapper; | ||||
| import com.iformall.mapper.WxMerchantMapper; | |||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.WxBillActionService; | import com.iformall.service.WxBillActionService; | ||||
| @@ -41,6 +42,9 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| @Autowired | @Autowired | ||||
| WxShopMapper wxShopMapper; | WxShopMapper wxShopMapper; | ||||
| @Autowired | |||||
| WxMerchantMapper wxMerchantMapper; | |||||
| @Autowired | @Autowired | ||||
| WxBillActionService wxBillActionService; | WxBillActionService wxBillActionService; | ||||
| @@ -133,14 +137,15 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); | ||||
| computeTotalMoney(wxPayAccountBill, wxBillOther); | computeTotalMoney(wxPayAccountBill, wxBillOther); | ||||
| wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); | wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); | ||||
| if (wxBillOther.getShopId() != null) { | |||||
| WxShop shop = new WxShop(); | |||||
| shop.setId(wxBillOther.getShopId()); | |||||
| List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| wxBillOther.setShops(shoplist); | |||||
| } else { | |||||
| wxBillOther.setShops(Collections.EMPTY_LIST); | |||||
| } | |||||
| wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); | |||||
| // if (wxBillOther.getShopId() != null) { | |||||
| // WxShop shop = new WxShop(); | |||||
| // shop.setId(wxBillOther.getShopId()); | |||||
| // List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| // wxBillOther.setShops(shoplist); | |||||
| // } else { | |||||
| // wxBillOther.setShops(Collections.EMPTY_LIST); | |||||
| // } | |||||
| return wxBillOther; | return wxBillOther; | ||||
| } | } | ||||
| @@ -11,6 +11,7 @@ import com.iformall.domain.po.*; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.mapper.WxBillOtherMapper; | import com.iformall.mapper.WxBillOtherMapper; | ||||
| import com.iformall.mapper.WxMerchantMapper; | |||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.WxBillActionService; | import com.iformall.service.WxBillActionService; | ||||
| @@ -41,6 +42,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| @Autowired | @Autowired | ||||
| WxShopMapper wxShopMapper; | WxShopMapper wxShopMapper; | ||||
| @Autowired | |||||
| WxMerchantMapper wxMerchantMapper; | |||||
| @Autowired | @Autowired | ||||
| WxBillActionService wxBillActionService; | WxBillActionService wxBillActionService; | ||||
| @@ -133,14 +137,15 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); | ||||
| computeTotalMoney(wxPayAccountBill, wxBillOther); | computeTotalMoney(wxPayAccountBill, wxBillOther); | ||||
| wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); | wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); | ||||
| if (wxBillOther.getShopId() != null) { | |||||
| WxShop shop = new WxShop(); | |||||
| shop.setId(wxBillOther.getShopId()); | |||||
| List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| wxBillOther.setShops(shoplist); | |||||
| }else{ | |||||
| wxBillOther.setShops(Collections.EMPTY_LIST); | |||||
| } | |||||
| wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); | |||||
| // if (wxBillOther.getShopId() != null) { | |||||
| // WxShop shop = new WxShop(); | |||||
| // shop.setId(wxBillOther.getShopId()); | |||||
| // List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); | |||||
| // wxBillOther.setShops(shoplist); | |||||
| // }else{ | |||||
| // wxBillOther.setShops(Collections.EMPTY_LIST); | |||||
| // } | |||||
| return wxBillOther; | return wxBillOther; | ||||
| } | } | ||||
| @@ -17,14 +17,13 @@ | |||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | ||||
| <result column="user_id" jdbcType="BIGINT" property="userId" /> | <result column="user_id" jdbcType="BIGINT" property="userId" /> | ||||
| <result column="shop_id" jdbcType="BIGINT" property="shopId" /> | <result column="shop_id" jdbcType="BIGINT" property="shopId" /> | ||||
| <result column="shop_name" jdbcType="VARCHAR" property="shopName" /> | |||||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | ||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | ||||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | ||||
| <result column="price_detail" jdbcType="VARCHAR" property="priceDetail"/> | <result column="price_detail" jdbcType="VARCHAR" property="priceDetail"/> | ||||
| <result column="shop_number" jdbcType="VARCHAR" property="shopNumber"/> | |||||
| <result column="starttime" property="starttime"/> | <result column="starttime" property="starttime"/> | ||||
| <result column="endtime" property="endtime"/> | <result column="endtime" property="endtime"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| @@ -34,7 +33,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | ||||
| `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, | |||||
| `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`, | |||||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay | `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay | ||||
| </sql> | </sql> | ||||
| @@ -57,8 +56,7 @@ | |||||
| <if test=" null != status "> and `status` = #{status} </if> | <if test=" null != status "> and `status` = #{status} </if> | ||||
| <if test=" null != isDel "> and `is_del` = #{isDel} </if> | <if test=" null != isDel "> and `is_del` = #{isDel} </if> | ||||
| <if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if> | <if test=" null != merchantId "> and `merchant_id` = #{merchantId} </if> | ||||
| <if test=" null != userId "> and `user_id` = #{userId} </if> | |||||
| <if test=" null != shopId "> and `shop_id` = #{shopId} </if> | |||||
| <if test=" null != userId "> and `user_id` = #{userId} </if> | |||||
| <if test=" null != updatetime "> and `updatetime` = #{updatetime} </if> | <if test=" null != updatetime "> and `updatetime` = #{updatetime} </if> | ||||
| <if test=" null != type "> and `type` = #{type} </if> | <if test=" null != type "> and `type` = #{type} </if> | ||||
| <if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if> | ||||
| @@ -81,11 +79,10 @@ | |||||
| <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="BaseResultMap"> | <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="BaseResultMap"> | ||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | ||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number, | |||||
| br.`updatetime`,br.`merchant_id`,br.shop_id,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, | |||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name, | |||||
| br.`updatetime`,br.`merchant_id`,br.shop_id,br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, | |||||
| br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay | br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay | ||||
| from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | ||||
| left join wx_shop s on br.shop_id=s.id | |||||
| <where> | <where> | ||||
| <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | ||||
| <if test=" null != id ">and br.`id` = #{id}</if> | <if test=" null != id ">and br.`id` = #{id}</if> | ||||
| @@ -17,8 +17,10 @@ | |||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | ||||
| <result column="user_id" jdbcType="BIGINT" property="userId" /> | <result column="user_id" jdbcType="BIGINT" property="userId" /> | ||||
| <result column="shop_id" jdbcType="BIGINT" property="shopId" /> | <result column="shop_id" jdbcType="BIGINT" property="shopId" /> | ||||
| <result column="shop_name" jdbcType="VARCHAR" property="shopName" /> | |||||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | ||||
| <result column="name" jdbcType="VARCHAR" property="name" /> | <result column="name" jdbcType="VARCHAR" property="name" /> | ||||
| <result column="comments" jdbcType="VARCHAR" property="comments" /> | <result column="comments" jdbcType="VARCHAR" property="comments" /> | ||||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | ||||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | ||||
| @@ -33,7 +35,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | ||||
| `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, | |||||
| `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`, | |||||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay | `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay | ||||
| </sql> | </sql> | ||||
| @@ -80,11 +82,10 @@ | |||||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultMap="BaseResultMap"> | <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultMap="BaseResultMap"> | ||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | ||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` | case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` | ||||
| merchant_name,s.shop_number,br.`updatetime`, | |||||
| merchant_name,br.shop_name,br.`updatetime`, | |||||
| br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way, | br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way, | ||||
| br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | ||||
| from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id | ||||
| left join wx_shop s on br.shop_id=s.id | |||||
| <where> | <where> | ||||
| <if test=" null != id ">and br.`id` = #{id}</if> | <if test=" null != id ">and br.`id` = #{id}</if> | ||||
| <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | <if test=" null != freeze ">and br.`freeze` = #{freeze}</if> | ||||
| @@ -15,6 +15,8 @@ | |||||
| <result column="owe" jdbcType="BIGINT" property="owe"/> | <result column="owe" jdbcType="BIGINT" property="owe"/> | ||||
| <result column="status" jdbcType="INTEGER" property="status"/> | <result column="status" jdbcType="INTEGER" property="status"/> | ||||
| <result column="is_del" jdbcType="INTEGER" property="isDel"/> | <result column="is_del" jdbcType="INTEGER" property="isDel"/> | ||||
| <result column="contract_need_pay" jdbcType="BIGINT" property="contractNeedPay"/> | |||||
| <result column="rent_price_info" jdbcType="VARCHAR" property="rentPriceInfo"/> | |||||
| <result column="need_pay" jdbcType="BIGINT" property="needPay"/> | <result column="need_pay" jdbcType="BIGINT" property="needPay"/> | ||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="user_id" jdbcType="BIGINT" property="userId"/> | <result column="user_id" jdbcType="BIGINT" property="userId"/> | ||||
| @@ -53,7 +55,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | ||||
| `createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`, | |||||
| `createtime`,`expired_day`,`owe`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`, | |||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | ||||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | ||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay | `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay | ||||
| @@ -106,7 +108,7 @@ | |||||
| <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxBillRent" resultMap="BaseResultMap"> | <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxBillRent" resultMap="BaseResultMap"> | ||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | ||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,r.merchant_name, | |||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,r.merchant_name, | |||||
| s.shop_number,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type, | s.shop_number,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type, | ||||
| r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | ||||
| d.receive_pay deposit,d.`status` | d.receive_pay deposit,d.`status` | ||||
| @@ -264,7 +266,7 @@ | |||||
| <insert id="insertBills" parameterType="java.util.List"> | <insert id="insertBills" parameterType="java.util.List"> | ||||
| INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, | INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, | ||||
| rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, | rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, | ||||
| owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, | |||||
| owe, status, is_del, contract_need_pay,rent_price_info,need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, | |||||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | ||||
| pay_way, late_pay_status, comments,service_charge_pay) | pay_way, late_pay_status, comments,service_charge_pay) | ||||
| VALUES | VALUES | ||||
| @@ -272,7 +274,7 @@ | |||||
| ( | ( | ||||
| #{item.id},#{item.tenantId},#{item.parentTenantId}, | #{item.id},#{item.tenantId},#{item.parentTenantId}, | ||||
| #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, | #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, | ||||
| #{item.expiredDay},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | |||||
| #{item.expiredDay},#{item.owe},#{item.status},#{item.isDel},#{item.contractNeedPay},#{item.rentPriceInfo},#{item.needPay},#{item.merchantId}, | |||||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | ||||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | ||||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay} | #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay} | ||||