Browse Source

发票打印相关

609324174@qq.com 4 years ago
parent
commit
ab3487db2f

+ 1 - 1
smart-city-platform/src/main/java/com/bz/smart_city/service/UserService.java

@@ -116,5 +116,5 @@ public interface UserService {
 
     void bindOpenId(String openId);
 
-    User findUserByName(String name, BigInteger customerId);
+    User findUserByName(String name, BigInteger sitId);
 }

+ 2 - 2
smart-city-platform/src/main/java/com/bz/smart_city/service/impl/UserServiceImpl.java

@@ -615,7 +615,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public User findUserByName(String name, BigInteger customerId) {
-        return userMapper.findUserByName(name,customerId);
+    public User findUserByName(String name, BigInteger sitId) {
+        return userMapper.findUserByName(name,sitId);
     }
 }

+ 14 - 3
smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/IssueElectronicInvoiceServiceImpl.java

@@ -112,13 +112,24 @@ public class IssueElectronicInvoiceServiceImpl implements IssueElectronicInvoice
     public ReturnPrintResultDto requestPrint(String siteId, String customerId, String kpType, String userCode, String payseriesno, String invoicePrintId,String email) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         ReturnPrintResultDto returnPrintResultDto = new ReturnPrintResultDto();//开票返回结果信息
-        String name = loginUser.getName();//操作员姓名
+
         if(loginUser==null) {
-            // User user = userService.findUserByName("系统操作", BigInteger.valueOf(Long.parseLong(siteId)));
-            //loginUser = new LoginUser();
+             User user = userService.findUserByName("系统操作", BigInteger.valueOf(Long.parseLong(siteId)));
+             loginUser = new LoginUser();
+             if(user!=null)
+             {
+                 loginUser.setName("系统操作");
+                 loginUser.setId(user.getId());
+             }else
+             {
+                 returnPrintResultDto.setResult("1");//开票失败
+                 returnPrintResultDto.setMsg("开票失败,失败原因:系统未配置操作员");
+                 return returnPrintResultDto;
+             }
             loginUser.setCustomerId(Integer.valueOf(customerId));
             loginUser.setSiteId(Integer.valueOf(siteId));
         }
+        String name = loginUser.getName();//操作员姓名
         BaseClosingAccountInfo baseClosingAccountInfo = baseClosingAccountInfoService.getCurrentCloseInfo(loginUser.getSiteId(),loginUser.getCustomerId());
         if(baseClosingAccountInfo==null)
         {