winter 1 год назад
Родитель
Сommit
1cad7ebca5
4 измененных файлов: 11 добавлений и 5 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  4. +8
    -2
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

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

@@ -770,7 +770,7 @@ public class WxFinanceController extends BaseController {
return new ResultData(Result.ERROR,"finishId参数不能为空"); return new ResultData(Result.ERROR,"finishId参数不能为空");
} }
record.updateTenantInfo(getTenantInfo()); record.updateTenantInfo(getTenantInfo());
wxFinanceService.auditReceive(record, getUser());
wxFinanceService.auditFinish(record, getUser());
return new ResultData(); return new ResultData();
} }


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

@@ -84,7 +84,7 @@ public interface WxFinanceService {
WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record); WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record);
WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record); WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record);
List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record); List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record);
void auditReceive(WxFinanceFinish record,MallUserInfo user);
void auditFinish(WxFinanceFinish record,MallUserInfo user);
Integer getReceiveUnFinisedCount(WxFinanceReceive record); Integer getReceiveUnFinisedCount(WxFinanceReceive record);
void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user);
void deleteFinish(WxFinanceFinish record); void deleteFinish(WxFinanceFinish record);


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

@@ -1624,7 +1624,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override @Override
public void auditReceive(WxFinanceFinish record, MallUserInfo user) {
public void auditFinish(WxFinanceFinish record, MallUserInfo user) {
WxFinanceFinish finish = this.getFinishById(record, record.getId()); WxFinanceFinish finish = this.getFinishById(record, record.getId());
//更新批次, //更新批次,
WxFinanceFinish ff = new WxFinanceFinish(); WxFinanceFinish ff = new WxFinanceFinish();


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

@@ -171,8 +171,14 @@
<update id="updateFinish" parameterType="com.iformall.domain.po.WxFinanceReceive"> <update id="updateFinish" parameterType="com.iformall.domain.po.WxFinanceReceive">
update wx_finance_receive set is_finish = #{isFinish} update wx_finance_receive set is_finish = #{isFinish}
<include refid="dynamicWhereConditions"/>
and status not in (2,3,4)
where status not in (2,3,4)
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
</update> </update>
<update id="updatePrint" parameterType="com.iformall.domain.po.WxFinanceReceive"> <update id="updatePrint" parameterType="com.iformall.domain.po.WxFinanceReceive">


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