Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/insurance/InsuranceController.java

@@ -86,6 +86,14 @@ public class InsuranceController {
         insuranceService.applyInsuranceNew(id);
         return success(true);
     }
+    @GetMapping("/queryInsurance")
+    @Operation(summary = "查询保单并返回信息")
+    @OperateLog(type = API)
+    @PreAuthorize("@ss.hasPermission('trade:insurance:query')")
+    public CommonResult<String> queryInsurance(@RequestParam("id") Long id) {
+        String res = insuranceService.queryInsurance(id);
+        return success(res);
+    }
 
     @GetMapping("/queryEpolicy")
     @Operation(summary = "根据id获取电子保单")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/insurance/InsuranceService.java

@@ -79,4 +79,11 @@ public interface InsuranceService {
     void applyInsuranceNew(Long id);
 
     List<InsuranceDO> getListByVisitorIds(List<Long> visitorIds);
+
+    /**
+     * 反查保单错误信息
+     * @param id
+     * @return
+     */
+    String queryInsurance(Long id);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/insurance/InsuranceServiceImpl.java

@@ -436,7 +436,7 @@ public class InsuranceServiceImpl implements InsuranceService {
         //被保人对象列表, 其下可多位被保险人, 他们在同个订单下
         List<InsuredDTO> insuredList = new ArrayList<>();
         InsuredDTO insuredDTO = new InsuredDTO();
-        insuredDTO.setExternalPolicyNumber(tradeVisitorDO.getId().toString());
+        insuredDTO.setExternalPolicyNumber(insuranceId.toString());
         String name = tradeVisitorDO.getName();
         insuredDTO.setInsuredName(name);
         if(9 == tradeVisitorDO.getCredentialType()) {
@@ -533,6 +533,19 @@ public class InsuranceServiceImpl implements InsuranceService {
         return insuranceMapper.selectListByVisitorIds(visitorIds);
     }
 
+    @Override
+    public String queryInsurance(Long id) {
+        CommonResult commonResult = insuranceUtil.queryInsurance(id.toString());
+        if (!commonResult.isSuccess()) {
+            throw exception0(commonResult.getCode(), commonResult.getMsg());
+        } else if (commonResult.isSuccess()) {
+            String str = (String) commonResult.getCheckedData();
+//            JSONObject.
+        }
+
+        return null;
+    }
+
     @Override
     public void queryInsuranceByOrderId(Long id) {
         InsuranceDO insuranceDO = insuranceMapper.selectById(id);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/notify/NotifyServiceImpl.java

@@ -36,11 +36,12 @@ public class NotifyServiceImpl implements NotifyService {
         TenantUtils.execute(1L, () -> {
             String status = reqVO.getStatus();
             String externalPolicyNumber = reqVO.getExternalPolicyNumber();
+            String externalOrderNo = reqVO.getExternalOrderNo();
             String policyNo = reqVO.getPolicyNo();
             String downloadUrl = reqVO.getDownloadUrl();
             String msg = reqVO.getMsg();
 //        String successDate = reqVO.getSuccessDate();
-            Long id = Long.valueOf(externalPolicyNumber);
+            Long id = Long.valueOf(externalOrderNo);
             String service = reqVO.getService();
             InsuranceDO insuranceDO = insuranceMapper.selectById(id);
             if("SUCCESS".equals(status)) {
@@ -71,7 +72,7 @@ public class NotifyServiceImpl implements NotifyService {
                 insuranceDO.setResMsg(msg);
             }
             insuranceMapper.updateById(insuranceDO);
-            tradeOrderRepositoryService.updateOrderInsureStatus(insuranceDO.getOrderId(),insuranceDO.getInsuranceStatus());
+//            tradeOrderRepositoryService.updateOrderInsureStatus(insuranceDO.getOrderId(),insuranceDO.getInsuranceStatus());
             tradeVisitorMapper.updateInsuranceById(insuranceDO.getVisitorId(), insuranceDO.getInsuranceStatus(), insuranceDO.getResMsg());
         });
         return true;