Преглед на файлове

//..merchant

release_toaliyun_real
xhxu преди 2 години
родител
ревизия
94a129fde0
променени са 6 файла, в които са добавени 14 реда и са изтрити 10 реда
  1. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java
  2. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
  5. +3
    -2
      mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml
  6. +3
    -2
      mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml

+ 1
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java Целия файл

@@ -122,9 +122,7 @@ public class AliBusinessCircleOrderController extends BaseController {
if (null == circleOrder) { if (null == circleOrder) {
circleOrder = new AliBusinessCircleOrder(); circleOrder = new AliBusinessCircleOrder();
} }
// circleOrder.updateTenantInfo(getTenantInfo());
circleOrder.setTenantId("789");
circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
circleOrder.updateTenantInfo(getTenantInfo());
final PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); final PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 1
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java Целия файл

@@ -118,9 +118,7 @@ public class WxBusinessCircleOrderController extends BaseController {
if (null == circleOrder) { if (null == circleOrder) {
circleOrder = new WxBusinessCircleOrder(); circleOrder = new WxBusinessCircleOrder();
} }
// circleOrder.updateTenantInfo(getTenantInfo());
circleOrder.setTenantId("789");
circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
circleOrder.updateTenantInfo(getTenantInfo());
final PageInfo<AlipayOrWxStatistics> page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); final PageInfo<AlipayOrWxStatistics> page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java Целия файл

@@ -389,6 +389,9 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) { if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids); record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
} }
} }




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java Целия файл

@@ -564,6 +564,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) { if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids); record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
} }
} }




+ 3
- 2
mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml Целия файл

@@ -229,7 +229,7 @@
and is_refund = 1 and is_refund = 1
</select> </select>


<select id="aliPayList" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
<select id="aliPayList" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT SUM(pay_amount) as 'payAmount', SELECT SUM(pay_amount) as 'payAmount',
SUM(refund_amount) as 'refundAmount', SUM(refund_amount) as 'refundAmount',
merchant_id as 'merchantId', merchant_id as 'merchantId',
@@ -241,7 +241,8 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
GROUP BY merchant_id,is_refund;
GROUP BY merchant_id,is_refund
order by payAmount desc;
</select> </select>


</mapper> </mapper>

+ 3
- 2
mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml Целия файл

@@ -261,7 +261,7 @@
and is_refund = 1 and is_refund = 1
</select> </select>


<select id="wxPayList" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
<select id="wxPayList" parameterType="com.iformall.domain.po.WxBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT SUM(pay_amount) as 'payAmount', SELECT SUM(pay_amount) as 'payAmount',
SUM(refund_amount) as 'refundAmount', SUM(refund_amount) as 'refundAmount',
merchant_id as 'merchantId', merchant_id as 'merchantId',
@@ -273,6 +273,7 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
GROUP BY merchant_id,is_refund;
GROUP BY merchant_id,is_refund
order by payAmount desc;
</select> </select>
</mapper> </mapper>

Зареждане…
Отказ
Запис