Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2210' into release

develop
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
f0b171959b
7 измененных файлов: 18 добавлений и 14 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  6. +6
    -4
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml
  7. +6
    -4
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java Просмотреть файл

@@ -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);




+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java Просмотреть файл

@@ -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);




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

@@ -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;


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

@@ -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);


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

@@ -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);


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

@@ -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') &lt; '06:00') ((date_format(cs.create_date,'%H:%m') &lt; '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>






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

@@ -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" >


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