po统一接口开发,实体字段调整

release
wangzhikun 2 years ago
parent ddc0978485
commit 4b4417595e
  1. 1
      dxhy-common/src/main/java/com/dxhy/common/constant/ConfigureConstant.java
  2. 22
      dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  3. 3
      dxhy-erp/src/main/java/com/dxhy/erp/dao/AreaDao.java
  4. 2
      dxhy-erp/src/main/java/com/dxhy/erp/dao/OrgUserInfoDao.java
  5. 40
      dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseInvoiceEditVO.java
  6. 2
      dxhy-erp/src/main/java/com/dxhy/erp/model/IsInput.java
  7. 5
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java

@ -36,6 +36,7 @@ public class ConfigureConstant {
public static final int INT_0 = 0; public static final int INT_0 = 0;
public static final int INT_2 = 2; public static final int INT_2 = 2;
public static final String POTOKEN="6_ca323ed526e74edea7e023c0733a9bef";
} }

@ -26,6 +26,7 @@ import com.dxhy.common.utils.GzipUtils;
import com.dxhy.common.utils.R; import com.dxhy.common.utils.R;
import com.dxhy.common.utils.TripleDesUtil; import com.dxhy.common.utils.TripleDesUtil;
import com.dxhy.erp.dao.SysDeptDao; import com.dxhy.erp.dao.SysDeptDao;
import com.dxhy.erp.entity.BaseInvoiceEditVO;
import com.dxhy.erp.entity.SalesInvoicePushInfos; import com.dxhy.erp.entity.SalesInvoicePushInfos;
import com.dxhy.erp.entity.SysDeptEntity; import com.dxhy.erp.entity.SysDeptEntity;
import com.dxhy.erp.entity.TDxInvoiceReimburse; import com.dxhy.erp.entity.TDxInvoiceReimburse;
@ -1128,6 +1129,21 @@ public class InterfaceController extends AbstractController {
} }
return returnResult; return returnResult;
} }
@RequestMapping(path = "/po",method={RequestMethod.POST,RequestMethod.GET})
public String po(@RequestBody String param,HttpServletRequest request){
String token = request.getHeader("token");
if(org.apache.commons.lang3.StringUtils.isBlank(token) && !ConfigureConstant.POTOKEN.equals(token)){
return "非法请求,请停止访问!";
}
String resultString = "";
ErpInvoiceData requestParam = JsonUtils.getInstance().parseObject(param, ErpInvoiceData.class);
//同步 凭证号 判断自动认证接口开发
if("FI005".equals(requestParam.getIS_INPUT().getIFYWID())){
resultString = receiveErpInvoiceMessage(requestParam);
}
return resultString;
}
@PostMapping("receiveErpInvoiceMessage") @PostMapping("receiveErpInvoiceMessage")
public String receiveErpInvoiceMessage(@RequestBody ErpInvoiceData erpInvoiceData){ public String receiveErpInvoiceMessage(@RequestBody ErpInvoiceData erpInvoiceData){
@ -1143,10 +1159,14 @@ public class InterfaceController extends AbstractController {
esOutPutResp.setZTYPE("E"); esOutPutResp.setZTYPE("E");
esOutPutResp.setZMESSAGE("程序内部错误"); esOutPutResp.setZMESSAGE("程序内部错误");
return JsonUtils.getInstance().toJsonString(esOutPutResp); return JsonUtils.getInstance().toJsonString(esOutPutResp);
} }
}
@PostMapping("transferOut")
public String transferOut(@RequestBody IsInput isInput){
BaseInvoiceEditVO baseInvoiceEditVO = new BaseInvoiceEditVO();
return null;
} }
} }

@ -1,6 +1,7 @@
package com.dxhy.erp.dao; package com.dxhy.erp.dao;
import com.dxhy.erp.entity.sdny.area.Area; import com.dxhy.erp.entity.sdny.area.Area;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -13,7 +14,7 @@ import java.util.List;
* @author 大象慧云shanQing * @author 大象慧云shanQing
* @since 2017-10-23 16:31:10 * @since 2017-10-23 16:31:10
*/ */
@Repository @Mapper
public interface AreaDao { public interface AreaDao {
/** /**

@ -2,6 +2,7 @@ package com.dxhy.erp.dao;
import com.dxhy.erp.entity.sdny.BxwxEnterpriseUserEntity; import com.dxhy.erp.entity.sdny.BxwxEnterpriseUserEntity;
import com.dxhy.erp.entity.sdny.OrgUserInfo; import com.dxhy.erp.entity.sdny.OrgUserInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -13,6 +14,7 @@ import java.util.Optional;
* @author guoker * @author guoker
* @date 2020-12-29 * @date 2020-12-29
*/ */
@Mapper
public interface OrgUserInfoDao { public interface OrgUserInfoDao {
/** /**

@ -0,0 +1,40 @@
package com.dxhy.erp.entity;
import lombok.Data;
/**
* @author peipei.li
* @date 2019-04-25 进项税转出确认条件vo
*/
@Data
public class BaseInvoiceEditVO {
/**
* 主键多个以英文逗号分隔结尾不加逗号
*/
private String primaryKey;
/**
* 转出选项1=全部转出 2=部分转出
*/
private String outStatus;
/**
* 转出金额
*/
private String outAmount;
/**
* 转出税额
*/
private String outTax;
/**
* 转出原因
*/
private String outReason;
/**
* 备注
*/
private String outRemark;
}

@ -32,7 +32,7 @@ public class IsInput {
@JsonProperty(value = "ZFILED5") @JsonProperty(value = "ZFILED5")
private String ZFILED5; private String ZFILED5;
@JsonProperty(value = "ZDATA") @JsonProperty(value = "ZDATA")
private List<ZDATA> ZDATA; private String ZDATA;
} }

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.dxhy.common.enums.FplxEnum; import com.dxhy.common.enums.FplxEnum;
import com.dxhy.erp.model.*; import com.dxhy.erp.model.*;
import com.dxhy.erp.utils.JsonUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -326,8 +327,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
es.setZTYPE("S"); es.setZTYPE("S");
ZDATARESP zdataresp = new ZDATARESP(); ZDATARESP zdataresp = new ZDATARESP();
StringBuilder promsg = new StringBuilder(); StringBuilder promsg = new StringBuilder();
String zdata2 = isInput.getZDATA();
List<ZDATA> zdata = isInput.getZDATA(); List<ZDATA> zdata = JSON.parseArray(zdata2, ZDATA.class);
AuthDateReq authDateReq=new AuthDateReq(); AuthDateReq authDateReq=new AuthDateReq();
authDateReq.setBatchNo(isInput.getSAPKEY()); authDateReq.setBatchNo(isInput.getSAPKEY());
authDateReq.setApplyRzlx("1"); authDateReq.setApplyRzlx("1");

Loading…
Cancel
Save