Parcourir la source

fix

release_toaliyun_real
winter il y a 1 an
Parent
révision
6471d435c7
3 fichiers modifiés avec 29 ajouts et 2 suppressions
  1. +25
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 25
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Voir le fichier

@@ -19,6 +19,7 @@ import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.WxFinanceReceiveVo;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumFinanceCashierType;
import com.iformall.enums.EnumFinanceFinishStatus;
import com.iformall.enums.EnumFinanceReceiveStatus;
import com.iformall.enums.EnumFinanceReceiveType;
@@ -258,6 +259,18 @@ public class WxFinanceController extends BaseController {
return new ResultData(list);
}
@GetMapping("cashierTypes")
public ResultData cashierTypes() {
List<Map> list = new ArrayList<Map>();
for (EnumFinanceCashierType t : EnumFinanceCashierType.values()) {
Map m = new HashMap();
m.put("id", t.getCode());
m.put("name", t.getMessage());
list.add(m);
}
return new ResultData(list);
}
@ApiOperation("收款记录列表")
@GetMapping("receiveList")
@ApiImplicitParams({
@@ -331,6 +344,18 @@ public class WxFinanceController extends BaseController {
return new ResultData(list);
}
@GetMapping("finishReceiveStatus")
public ResultData finishReceiveStatus() {
List<Map> list = new ArrayList<Map>();
for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getFinishStatus()) {
Map m = new HashMap();
m.put("id", t.getCode());
m.put("name", t.getMessage());
list.add(m);
}
return new ResultData(list);
}
@ApiOperation("过账列表")
@GetMapping("finishList")
@ApiImplicitParams({


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java Voir le fichier

@@ -39,7 +39,7 @@ public enum EnumFinanceReceiveStatus {
return message;
}
public static List<EnumFinanceReceiveStatus> getSetoff() {
public static List<EnumFinanceReceiveStatus> getFinishStatus() {
List<EnumFinanceReceiveStatus> list = new ArrayList<EnumFinanceReceiveStatus>();
list.add(NORMAL);
list.add(FINISH);


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Voir le fichier

@@ -16,6 +16,7 @@ import com.iformall.domain.po.WxFinancePrintTemplate;
import com.iformall.domain.po.WxFinanceReceive;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumFinancePrintDataType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxFinancePrintDataMapper;
import com.iformall.mapper.WxFinancePrintTemplateMapper;
@@ -113,7 +114,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
t.setCreateTime(new Date());
t.setUpdateTime(new Date());
t.setName(t.getName()+"复制");
wxFinancePrintTemplateMapper.insert(record);
t.setIsDel(EnumYesOrNo.NO.getCode());
wxFinancePrintTemplateMapper.insert(t);
}

@Override


Chargement…
Annuler
Enregistrer