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

[补贴汇总][修改]

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
bfe2fddd8f
2 измененных файлов: 11 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  2. +10
    -2
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Просмотреть файл

@@ -57,7 +57,7 @@ public class WxMerchantSubsidyController extends BaseController {


@ApiOperation("更新补贴记录") @ApiOperation("更新补贴记录")
@PostMapping("updateSubsidied") @PostMapping("updateSubsidied")
public ResultData listMonth(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) {
public ResultData updateSubsidied(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy();


+ 10
- 2
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml Просмотреть файл

@@ -182,7 +182,8 @@
</select> </select>


<select id="sumVoList" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="hashmap"> <select id="sumVoList" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="hashmap">
select IFNULL(sum(ms.`order_payment`),0) as sum_order_payment,
select ms.merchant_id, m.name as merchant_name,
IFNULL(sum(ms.`order_payment`),0) as sum_order_payment,
IFNULL(sum(ms.`receiver_payment`),0) as sum_receiver_payment, IFNULL(sum(ms.`receiver_payment`),0) as sum_receiver_payment,
IFNULL(sum(ms.`subsidy`),0) as sum_subsidy, IFNULL(sum(ms.`subsidy`),0) as sum_subsidy,
IFNULL(sum(ms.`real_subsidy`),0) as sum_real_subsidy IFNULL(sum(ms.`real_subsidy`),0) as sum_real_subsidy
@@ -190,7 +191,14 @@
left join wx_coupon_order co on co.id = ms.coupon_order_id left join wx_coupon_order co on co.id = ms.coupon_order_id
left join wx_coupon c on c.id = co.coupon_id left join wx_coupon c on c.id = co.coupon_id
left join wx_merchant m on m.id = ms.merchant_id left join wx_merchant m on m.id = ms.merchant_id
<include refid="dynamicVoWhereConditions" />
<where>
<if test=" null != status ">
and ms.`status` = #{status}
</if>
<if test=" null != startdate and null!=enddate">
and ms.`create_date` between #{startdate} and #{enddate}
</if>
</where>
</select> </select>


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