Преглед изворни кода

[营销补贴][修改][结单]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
baf8ab5e23
4 измењених фајлова са 17 додато и 9 уклоњено
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java
  3. +10
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java
  4. +5
    -4
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Прегледај датотеку

@@ -109,8 +109,7 @@ public class WxMerchantSubsidyController extends BaseController {
wxMerchantSubsidy.setIds(tmpList);
}
}
int num = wxMerchantSubsidyService.update(wxMerchantSubsidy);
return new ResultData(num);
return wxMerchantSubsidyService.update(wxMerchantSubsidy);
}

@ApiOperation("补贴记录导出")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java Прегледај датотеку

@@ -48,7 +48,7 @@ public interface WxMerchantSubsidyService {
*
* @param record
*/
int update(WxMerchantSubsidy record);
ResultData update(WxMerchantSubsidy record);

/**
* 根据Id删除实体


+ 10
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java Прегледај датотеку

@@ -2,6 +2,8 @@ package com.iformall.service.impl;

import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo;
@@ -11,6 +13,7 @@ import com.iformall.mapper.WxMerchantSubsidyMapper;
import com.iformall.service.WxMerchantSubsidyService;
import com.iformall.utils.Constant;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -64,8 +67,13 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
}

@Override
public int update(WxMerchantSubsidy record) {
return wxMerchantSubsidyMapper.updateByCond(record);
public ResultData update(WxMerchantSubsidy record) {
String idStr = record.getIdStr();
if (StringUtils.isEmpty(idStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "结单数据没有传入");
}
wxMerchantSubsidyMapper.updateByCond(record);
return new ResultData(Result.SUCCESS, "操作成功");
}

@Override


+ 5
- 4
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml Прегледај датотеку

@@ -91,12 +91,13 @@
select <include refid="allColumns" /> from wx_merchant_subsidy
<include refid="dynamicWhereConditions" />
</select>
<select id="updateByCond" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultMap="BaseResultMap">
<update id="updateByCond" parameterType="com.iformall.domain.po.WxMerchantSubsidy">
update wx_merchant_subsidy
set `status` = #{status}
<include refid="dynamicWhereConditions" />
</select>
where `tenant_id`=#{tenantId} and merchant_id=#{merchantId}
and id in (${idStr})
</update>


<resultMap id="VoBaseResultMap" type="com.iformall.domain.vo.WxMerchantSubsidyVo">


Loading…
Откажи
Сачувај