diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java index be8c8992e..78d866cdf 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java @@ -59,8 +59,6 @@ public class EmisSettleInvoiceChRecordController extends BaseController @Autowired private IEmisSettleInvoiceChRecordService emisSettleInvoiceChRecordService; - - /** * 查询渠道开票记录表列表 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index a393b474f..2930151bd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -27,6 +27,7 @@ import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.mapper.EmisBaseInvoiceChInfoMapper; import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRecordMapper; +import com.xdadan.erp.emis.mapper.EmisSettlePayRecordMapper; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.IEmisSettleBillService; import com.xdadan.erp.emis.service.excelCellStrategy.InvoiceExportHelper; @@ -64,6 +65,9 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem @Autowired private EmisSettleInvoiceRecordMapper emisSettleInvoiceRecordMapper; + @Autowired + private EmisSettlePayRecordMapper emisSettlePayRecordMapper; + @Autowired private IEmisSettleBillService emisSettleBillService; @@ -290,6 +294,8 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem throw new EmisBizError(EmisBizErrorType.FAIL,"未审核通过,不允许开票!"); } + // 判断是否存在在线支付,存在在线支付不允许开非探路者发票 + // 判断对应账单是否存在 String reqNo= WaybillHelper.genOrderSn(); emisSettleInvoiceChRecord.setReqNo(reqNo); @@ -341,6 +347,12 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem return 1; } + private void checkCanOpenBill(String settleBillNo,String openTaxNo){ + + List list=emisSettlePayRecordMapper.selectSettlePayRecordListBySettleBillNo(settleBillNo); + + } + /** * 发送到航信开票 * @param id diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java index b98103a68..533fda109 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java @@ -14,7 +14,8 @@ import java.util.List; @Slf4j public class HXSdk { - public static String HX_URLPREFIX="https://csfw.jsaisino.com/csapp/stms-saas-pc/"; +// public static String HX_URLPREFIX="https://csfw.jsaisino.com/csapp/stms-saas-pc/"; + public static String HX_URLPREFIX="https://kp.jsaisino.com/csapp/stms-saas-pc/"; /** * 刷新对应税号的token diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/OpenServiceDemo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/OpenServiceDemo.java index 46168f7a7..a210e14c2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/OpenServiceDemo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/OpenServiceDemo.java @@ -14,7 +14,8 @@ import com.alibaba.fastjson.JSONObject; public class OpenServiceDemo { public static void main(String[] args) { // 开放平台对接URL固定前缀 - String urlPrefix = "https://csfw.jsaisino.com/csapp/stms-saas-pc/"; +// String urlPrefix = "https://csfw.jsaisino.com/csapp/stms-saas-pc/"; + String urlPrefix = "https://kp.jsaisino.com/csapp/stms-saas-pc/"; // 1、通过平台提供的appkey secretKey 获取token String getTokenUrlsuffix = "/open/service/getToken"; // String getTokenRequest = "{\"appKey\":\"91440400MA4WKU0K8A\",\"secretKey\":\"a12136297be249ee9ca5fd9c862c7ca2\"}"; diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 7299a7889..f5597f43d 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -986,6 +986,8 @@ + + and ( a.salesmen=#{params.privEmpName}