developrelease_toaliyun_real
| @@ -14,7 +14,7 @@ public interface WxCardSpendMapper extends CommonMapper<WxCardSpend, Long> { | |||||
| int findCount(WxCardSpend wxCardSpend); | int findCount(WxCardSpend wxCardSpend); | ||||
| List<Map<String,Object>> getCountByBusinessId(WxCardSpend wxCardSpend); | List<Map<String,Object>> getCountByBusinessId(WxCardSpend wxCardSpend); | ||||
| List<Map<String,Object>> getCountByBusinessIdAndSubId(WxCardSpend wxCardSpend); | |||||
| List<Map<String,Object>> getCountBySubBusinessId(WxCardSpend wxCardSpend); | |||||
| List<WxCardSpendVo> findCardSpendVoList(WxCardSpendVo wxCardSpend); | List<WxCardSpendVo> findCardSpendVoList(WxCardSpendVo wxCardSpend); | ||||
| @@ -27,7 +27,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||||
| //统一的计数接口 | //统一的计数接口 | ||||
| int findCount(WxCouponOrder wxCouponOrder); | int findCount(WxCouponOrder wxCouponOrder); | ||||
| List<Map<String, Object>> getCountByBusinessId(WxCouponOrder wxCouponOrder); | List<Map<String, Object>> getCountByBusinessId(WxCouponOrder wxCouponOrder); | ||||
| List<Map<String, Object>> getCountByBusinessIdAndSubId(WxCouponOrder wxCouponOrder); | |||||
| List<Map<String, Object>> getCountBySubBusinessId(WxCouponOrder wxCouponOrder); | |||||
| //统一额度统计接口 | //统一额度统计接口 | ||||
| int queryPriceTotal(WxCouponOrder wxCouponOrder); | int queryPriceTotal(WxCouponOrder wxCouponOrder); | ||||
| @@ -433,8 +433,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| subBusiness.setBusinessId(EnumBusiness.BUSINESS_ID1.getCode()); | subBusiness.setBusinessId(EnumBusiness.BUSINESS_ID1.getCode()); | ||||
| List<WxSubBusiness> list = wxSubBusinessMapper.findList(subBusiness); | List<WxSubBusiness> list = wxSubBusinessMapper.findList(subBusiness); | ||||
| List<Map<String, Object>> cardSpendCountList = wxCardSpendMapper.getCountByBusinessIdAndSubId(wxCardSpend); | |||||
| List<Map<String, Object>> cardOrderCountList = wxCouponOrderMapper.getCountByBusinessIdAndSubId(wxCouponOrder); | |||||
| List<Map<String, Object>> cardSpendCountList = wxCardSpendMapper.getCountBySubBusinessId(wxCardSpend); | |||||
| List<Map<String, Object>> cardOrderCountList = wxCouponOrderMapper.getCountBySubBusinessId(wxCouponOrder); | |||||
| list.stream().forEach(sb->{ | list.stream().forEach(sb->{ | ||||
| int count = 0; | int count = 0; | ||||
| @@ -225,7 +225,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| bill.setCreatetime(new Date()); | bill.setCreatetime(new Date()); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getReceivePay()); | |||||
| bill.setNeedPay(bill.getNeedPay()); | |||||
| bill.setUpdatetime(new Date()); | bill.setUpdatetime(new Date()); | ||||
| bill.setRentShopType(record.getRentShopType()); | bill.setRentShopType(record.getRentShopType()); | ||||
| bill.setPeriod(count); | bill.setPeriod(count); | ||||
| @@ -459,7 +459,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| bill.setCreatetime(new Date()); | bill.setCreatetime(new Date()); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getReceivePay()); | |||||
| bill.setNeedPay(bill.getNeedPay()); | |||||
| bill.setUpdatetime(new Date()); | bill.setUpdatetime(new Date()); | ||||
| bill.setRentShopType(record.getRentShopType()); | bill.setRentShopType(record.getRentShopType()); | ||||
| bill.setPeriod(count); | bill.setPeriod(count); | ||||
| @@ -209,10 +209,12 @@ | |||||
| group by m.business_id | group by m.business_id | ||||
| </select> | </select> | ||||
| <select id="getCountByBusinessIdAndSubId" parameterType="com.iformall.domain.po.WxCardSpend" resultType="hashmap"> | |||||
| select m.business_id, m.sub_business_id, count(m.business_id + '' + m.sub_business_id) bu_count | |||||
| <select id="getCountBySubBusinessId" parameterType="com.iformall.domain.po.WxCardSpend" resultType="hashmap"> | |||||
| select m.sub_business_id, count(m.sub_business_id) bu_count | |||||
| from wx_card_spend cs | from wx_card_spend cs | ||||
| inner join wx_merchant m on m.id = cs.merchant_id | |||||
| <if test=" null != businessId "> | |||||
| inner join wx_merchant m on m.id = cs.merchant_id and m.business_id = #{businessId} | |||||
| </if> | |||||
| where 1 = 1 | where 1 = 1 | ||||
| <if test=" null != ownerId "> | <if test=" null != ownerId "> | ||||
| and cs.`owner_id` = #{ownerId} | and cs.`owner_id` = #{ownerId} | ||||
| @@ -250,7 +252,7 @@ | |||||
| ((date_format(cs.create_date,'%H:%m') < '06:00') | ((date_format(cs.create_date,'%H:%m') < '06:00') | ||||
| and date_format(cs.create_date,'%w') in (6,0))) | and date_format(cs.create_date,'%w') in (6,0))) | ||||
| </if> | </if> | ||||
| group by m.business_id, m.sub_business_id | |||||
| group by m.sub_business_id | |||||
| </select> | </select> | ||||
| @@ -418,10 +418,12 @@ | |||||
| group by c.business | group by c.business | ||||
| </select> | </select> | ||||
| <select id="getCountByBusinessIdAndSubId" parameterType="com.iformall.domain.po.WxCouponOrder" resultType="hashmap"> | |||||
| select c.business, c.sub_business, COUNT(c.business+''+c.sub_business) bu_count | |||||
| <select id="getCountBySubBusinessId" parameterType="com.iformall.domain.po.WxCouponOrder" resultType="hashmap"> | |||||
| select c.sub_business, COUNT(c.sub_business) bu_count | |||||
| FROM wx_coupon_order co | FROM wx_coupon_order co | ||||
| inner join wx_coupon c on c.id = co.coupon_id | |||||
| <if test=" null != businessId "> | |||||
| inner join wx_coupon c on c.id = co.coupon_id and c.business = #{businessId} | |||||
| </if> | |||||
| where 1=1 | where 1=1 | ||||
| <if test=" null != tenantId"> | <if test=" null != tenantId"> | ||||
| and co.tenant_id = #{tenantId} | and co.tenant_id = #{tenantId} | ||||
| @@ -504,7 +506,7 @@ | |||||
| and date_format(co.create_date,'%w') in (6,0))) | and date_format(co.create_date,'%w') in (6,0))) | ||||
| </if> | </if> | ||||
| </if> | </if> | ||||
| group by c.business, c.sub_business | |||||
| group by c.sub_business | |||||
| </select> | </select> | ||||
| <select id="queryPriceTotalGroup" resultType="com.iformall.domain.vo.CUserDateAmountVo" > | <select id="queryPriceTotalGroup" resultType="com.iformall.domain.vo.CUserDateAmountVo" > | ||||