md
This commit is contained in:
parent
0155d64635
commit
2221287b97
@ -11,9 +11,14 @@
|
||||
|
||||
package com.xdadan.erp.oms.web;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
|
||||
import com.xdadan.erp.oms.common.core.controller.BaseController;
|
||||
import com.xdadan.erp.oms.common.core.domain.AjaxResult;
|
||||
import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser;
|
||||
import com.xdadan.erp.oms.common.core.page.TableDataInfo;
|
||||
import com.xdadan.erp.oms.domain.EmisMonthpayUseApply;
|
||||
import com.xdadan.erp.oms.service.IEmisMonthpayUseApplyService;
|
||||
import com.xdadan.erp.oms.system.mapper.SysOmsUserMapper;
|
||||
import com.xdadan.erp.oms.system.service.ISysOmsUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -38,12 +43,16 @@ public class Oms2cMonthpayAccountController extends BaseController
|
||||
@Autowired
|
||||
ISysOmsUserService sysOmsUserService;
|
||||
|
||||
@Autowired
|
||||
private IEmisMonthpayUseApplyService emisMonthpayUseApplyService;
|
||||
|
||||
|
||||
/**
|
||||
* 获取月结卡信息 注意,该接口单独重新包装,使用月结用户信息
|
||||
* @param sysOmsUser
|
||||
* @return
|
||||
*/
|
||||
// @JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||
@JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= SysOmsUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||
@GetMapping("/listSimple")
|
||||
public TableDataInfo listSimple(SysOmsUser sysOmsUser)
|
||||
{
|
||||
@ -53,6 +62,34 @@ public class Oms2cMonthpayAccountController extends BaseController
|
||||
|
||||
// "custNo","custName","payee","salesmen","payeeName","salesmenName"
|
||||
|
||||
// 获取已绑定的月结卡号自己的卡
|
||||
EmisMonthpayUseApply qMonthPayBind=new EmisMonthpayUseApply();
|
||||
qMonthPayBind.setCustomerCode(getLoginUser().getUser().getCustomerCode());
|
||||
qMonthPayBind.setAuditStatus(1);
|
||||
|
||||
List<EmisMonthpayUseApply> listSend=emisMonthpayUseApplyService.selectEmisMonthpayUseApplyList(qMonthPayBind);
|
||||
if(CollectionUtil.isEmpty(listSend)){
|
||||
for (EmisMonthpayUseApply useApply:listSend) {
|
||||
|
||||
SysOmsUser qSysOms=new SysOmsUser();
|
||||
qSysOms.setMonthlyPayCode(useApply.getCustNo());
|
||||
|
||||
List<SysOmsUser> omsUserList = sysOmsUserService.selectSysOmsUserList(qSysOms);
|
||||
if(!CollectionUtil.isEmpty(omsUserList)){
|
||||
SysOmsUser sysOmsUser0 = omsUserList.get(0);
|
||||
|
||||
SysOmsUser newUser=new SysOmsUser();
|
||||
newUser.setCustNo(sysOmsUser0.getCustNo());
|
||||
newUser.setCustName(sysOmsUser0.getCustName());
|
||||
newUser.setPayee(sysOmsUser0.getPayee());
|
||||
newUser.setPayeeName(sysOmsUser0.getPayeeName());
|
||||
newUser.setSalesmen(sysOmsUser0.getSalesmen());
|
||||
newUser.setSalesmenName(sysOmsUser0.getSalesmenName());
|
||||
list.add(newUser);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if("2".equals(user.getCustomerType())){
|
||||
SysOmsUser newUser=new SysOmsUser();
|
||||
newUser.setCustNo(user.getCustNo());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user