Przeglądaj źródła

Merge commit 'refs/tags/jenkins-back-end-735^{}' into release

release_toaliyun_real
hupeng 7 lat temu
rodzic
commit
ceff6c636b
2 zmienionych plików z 7 dodań i 7 usunięć
  1. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  2. +2
    -5
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 5
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Wyświetl plik

@@ -710,13 +710,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}

public void queryOrderSummary(String tenantId, Map<String, Object> result) {
//全部商户个数
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd");
//全部分账总数
Map<String, Object> params = new HashMap<>();
params.put("tenantId", tenantId);
String thirtyTime = DateUtils.getTimeBefore(29, new Date());
params.put("startdate", thirtyTime + " 00:00:00");
params.put("enddate", systemTime + " 23:59:59");
Long allOrderSummary=wxProfitSharingOrderMapper.queryOrderForSum(params);
result.put("allOrderSummary",allOrderSummary);
//今日
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd");
params.put("startdate", systemTime + " 00:00:00");
params.put("enddate", systemTime + " 23:59:59");
Long todayOrderSummary=wxProfitSharingOrderMapper.queryOrderForSum(params);


+ 2
- 5
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Wyświetl plik

@@ -175,7 +175,7 @@
<update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder">
update wx_order set order_status=#{orderStatus}
where product_id=#{productId}
and press_end_date is not null
and press_end_date is not null and order_status in (6,7)
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
@@ -536,10 +536,7 @@
<select id="queryOrderForSum" resultType="Long" parameterType="hashmap">
select ifnull(sum(o.payment),0) payment from (
select o.* from wx_order o
where o.type = 0 and o.order_status = #{order_status}
union all
select o.* from wx_order o
where o.type in (1,2) and o.order_status = #{order_status}
where o.type in (0,1,2) and o.order_status = #{order_status}
) o
<where>
<if test="tenantId!=null">


Ładowanie…
Anuluj
Zapisz