Bläddra i källkod

fix

release_toaliyun_real
winter 1 år sedan
förälder
incheckning
37613be103
6 ändrade filer med 42 tillägg och 0 borttagningar
  1. +17
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +9
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  6. +8
    -0
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

+ 17
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Visa fil

@@ -219,6 +219,15 @@ public class WxFinanceController extends BaseController {
return new ResultData(tmap); return new ResultData(tmap);
} }
@GetMapping("receiveSetoffStatus")
public ResultData receiveSetoffStatus() {
Map<Integer,EnumFinanceReceiveStatus> tmap = new HashMap<Integer,EnumFinanceReceiveStatus>();
for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getSetoff()) {
tmap.put(t.getCode(), t);
}
return new ResultData(tmap);
}
@GetMapping("receiveTypes") @GetMapping("receiveTypes")
public ResultData receiveTypes() { public ResultData receiveTypes() {
Map<Integer,EnumFinanceReceiveType> tmap = new HashMap<Integer,EnumFinanceReceiveType>(); Map<Integer,EnumFinanceReceiveType> tmap = new HashMap<Integer,EnumFinanceReceiveType>();
@@ -282,4 +291,12 @@ public class WxFinanceController extends BaseController {
return new ResultData(page); return new ResultData(page);
} }
@ApiOperation("过账")
@PostMapping("receiveFinish")
public ResultData receiveFinish(@RequestBody WxFinanceReceive record) {
record.updateTenantInfo(getTenantInfo());
wxFinanceService.finishReceive(record, getUser());
return new ResultData();
}
} }

+ 9
- 0
mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java Visa fil

@@ -1,5 +1,7 @@
package com.iformall.enums; package com.iformall.enums;


import java.util.ArrayList;
import java.util.List;


/** /**
*/ */
@@ -36,4 +38,11 @@ public enum EnumFinanceReceiveStatus {
public String getMessage() { public String getMessage() {
return message; return message;
} }
public static List<EnumFinanceReceiveStatus> getSetoff() {
List<EnumFinanceReceiveStatus> list = new ArrayList<EnumFinanceReceiveStatus>();
list.add(NORMAL);
list.add(FINISH);
return list;
}
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java Visa fil

@@ -16,5 +16,7 @@ public interface WxFinanceReceiveMapper extends CommonMapper<WxFinanceReceive, L
void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel);
List<WxFinanceReceive> getMerchantAdvanceGroupSumList(WxFinanceReceive record); List<WxFinanceReceive> getMerchantAdvanceGroupSumList(WxFinanceReceive record);
void finish(WxFinanceReceive wxBillRent);


} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxFinanceService.java Visa fil

@@ -30,6 +30,7 @@ public interface WxFinanceService {
WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id);
void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark);
void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); void redSetoffReceive(WxFinanceReceive record,MallUserInfo user);
void finishReceive(WxFinanceReceive record,MallUserInfo user);
//预收款 //预收款
List<WxBillBaseEntity> calcuetSetOff(FinanceSetOffDTO dto,MallUserInfo user); List<WxBillBaseEntity> calcuetSetOff(FinanceSetOffDTO dto,MallUserInfo user);
FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record); FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record);


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Visa fil

@@ -761,6 +761,11 @@ public class WxFinanceServiceImpl implements WxFinanceService {
record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode());
wxFinanceReceiveMapper.insert(record); wxFinanceReceiveMapper.insert(record);
} }
@Override
public void finishReceive(WxFinanceReceive record, MallUserInfo user) {
wxFinanceReceiveMapper.finish(record);
}


@Override @Override
public PageInfo<WxFinanceReceiveSetoff> receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, public PageInfo<WxFinanceReceiveSetoff> receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex,


+ 8
- 0
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml Visa fil

@@ -89,6 +89,14 @@
and money - use_money &gt; 0 and money - use_money &gt; 0
group by fees_id group by fees_id
</select> </select>
<update id="finish">
update wx_finance_receive set status = 4 where status = 1
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</update>


</mapper> </mapper>



Laddar…
Avbryt
Spara