Merge remote-tracking branch 'origin/release' into release

dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java

@@ -65,8 +65,9 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls =
-            {"/mailGatherLog/**","/emailMaintain/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info",
+            {"/mailGatherLog/**","/excel/apply","/emailMaintain/**","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info",
                 "/invoiceDetail/saleInfo", "/smcy/info", "/invoiceDetail/companyPoolInvoiceDetail/**", "/pool/**"};
+
         Collections.addAll(list, urls);
         return list;
     }

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -130,6 +130,16 @@ public class EmailMaintainController extends AbstractController  {
         if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
             return ResponseEntity.ok(R.error("邮箱地址已存在！"));
         }
+
+        String userId = emailMaintain.getUserId();
+
+        String userName = emailMaintainService.getUserName(userId);
+        if(StringUtils.isBlank(userName)){
+            R data = new R(101, "用户编码在系统中查询不到，请核实！");
+            data.put("data", "");
+            return ResponseEntity.ok(data);
+        }
+
         boolean b = emailMaintainService.update(emailMaintain);
         if(b){
             return ResponseEntity.ok(R.ok());
@@ -214,6 +224,13 @@ public class EmailMaintainController extends AbstractController  {
                     errorMsgList.add("第" + resultIndex + "行，用户邮箱地址重复，请核实！");
                     continue;
                 }
+
+                int i = emailMaintainService.selectByEmail(maintainExcel.getEmailAddress());
+                if(i>0){
+                    errorMsgList.add("第" + resultIndex + "行，邮箱数据已存在，请核实！");
+                    continue;
+                }
+
                 mailTitleList.add(maintainExcel.getEmailAddress());
 
                 EmailMaintainVo maintainVo = new EmailMaintainVo();
@@ -235,7 +252,11 @@ public class EmailMaintainController extends AbstractController  {
             if (ObjectUtil.isNotEmpty(errorMsgList)) {
                 JSONObject json = new JSONObject();
                 json.put("datalist", errorMsgList);
-                return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString())));
+
+                R data = new R(101, "校验信息有误");
+                data.put("data", json);
+                return ResponseEntity.ok(data);
+
             }
             int i = emailMaintainService.insertBatch(mailList);
             if(i > 0){
@@ -261,16 +282,16 @@ public class EmailMaintainController extends AbstractController  {
         if(StringUtils.isEmpty(userCode)){
             return ResponseEntity.ok(R.error("数据不能为空！"));
         }
-        DynamicContextHolder.push(DbConstant.BASICS_READ);
         String userName = emailMaintainService.getUserName(userCode);
-        if(StringUtils.isNotEmpty(userName)){
         JSONObject json = new JSONObject();
+        if(StringUtils.isNotEmpty(userName)){
             json.put("datalist", userName);
             log.debug("返回结果：{}", json.toJSONString());
             String jsonString = Base64.encode(json.toJSONString());
             return ResponseEntity.ok(R.ok().put("data",jsonString));
+        }else{
+            return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据"));
         }
-        return ResponseEntity.ok(R.error("未查询到相应数据！"));
     }
 
 }

dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java

@@ -53,6 +53,14 @@ public interface EmailMaintainDao extends BaseMapper<EmailMaintainVo> {
      */
     int insertBatch(@Param("entities") List<EmailMaintainVo> entities);
 
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<EmailMaintainVo> 实例对象列表
+     * @return 影响行数
+     */
+    int selectByEmail(@Param("email") String email);
+
     /**
      * 批量新增或按主键更新数据（MyBatis原生foreach方法）
      *

dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ConfirmServiceImpl.java

@@ -575,11 +575,11 @@ public class ConfirmServiceImpl extends ServiceImpl<ConfirmDao, TDxHttpLog> impl
                                     applyInfo.setBatchNo(batchNo);
                                     String dataStr = JSONObject.toJSONString(applyInfo);
                                     String base64Data = Base64.encode(dataStr);
+                                    log.info("org.getAceId()={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}",
+                                            org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey());
                                     // 加密串生成
                                     String appSec = makeAppSecService.makeAppSec(org.getAceId(), appid, enterpriseCode,
                                         applyLtgalize, version, base64Data, dataExchangeId, org.getAceKey());
-                                    log.info("org.getAceId()={},appid={},enterpriseCode={},applyLtgalize={},version={},base64Data={},dataExchangeId={},org.getAceKey={}",
-                                            org.getAceId(),appid,enterpriseCode,applyLtgalize,version,base64Data,dataExchangeId,org.getAceKey());
                                     // 请求报文拼接
                                     String requstData =
                                         requestData(appSec, dataExchangeId, base64Data, applyLtgalize, org.getAceId());

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java

@@ -52,5 +52,7 @@ public interface EmailMaintainService {
 
     int insertBatch(List<EmailMaintainVo> entities);
 
+    int selectByEmail(String email);
+
     EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain);
 }

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java

@@ -117,6 +117,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
 
     @Override
     public String getUserName(String userCode) {
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
         return emailMaintainDao.getUserName(userCode);
     }
 
@@ -125,6 +126,11 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
         return emailMaintainDao.insertBatch(entities);
     }
 
+    @Override
+    public int selectByEmail(String email) {
+        return emailMaintainDao.selectByEmail(email);
+    }
+
     @Override
     public EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain) {
         return emailMaintainDao.getEmailMaintainVo(emailMaintain);

dxhy-core/src/main/resources/bootstrap-std.yaml

@@ -19,7 +19,7 @@ spring:
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.147:33000
         # Nacos config 登录用户名
         username: admin
         # Nacos config 登录密码

dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml

@@ -165,5 +165,9 @@
         select username from sys_user where loginname = #{userCode}
     </select>
 
+    <select id="selectByEmail" resultType="java.lang.Integer">
+        select count(1) from email_maintain where email_address = #{email}
+    </select>
+
 </mapper>
 

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -253,7 +253,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
                 vo.setSelected("0");
                 return vo;
             }
-            String uuid = dto.getInvoiceCode() + dto.getInvoiceNo();
+            String uuid ="";
+            if(dto.getInvoiceCode()!=null){
+                 uuid= dto.getInvoiceCode() + dto.getInvoiceNo();
+            }else {
+                uuid = dto.getInvoiceNo();
+            }
             List<TdxRecordInvoice> tdxRecordInvoices =
                 domesticRecordInvoiceDao.selectByUuidList(Collections.singletonList(uuid));
             // 底账信息查询
@@ -535,4 +540,5 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
         return business.stream().filter(b -> deptId.equals(b.getBusinessCode())).findFirst()
             .map(Business::getBusinessName).orElse(null);
     }
+
 }

dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java

@@ -81,7 +81,7 @@ public class VouncherSyncController {
             if(ztype.equals("S")){
                 return ResponseEntity.ok(R.ok().put("data","数据拉取成功"));
             }else {
-                return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT));
+                return ResponseEntity.ok(R.error((String)output.get("ZDATA")));
             }
 
         }catch (Exception e ){