1. 修改动态回传地址

2. 新增网购小票没有购买日期时已上传日期-1作为购买日期
3. 修复cb_log的message字段内容缺失的问题

src/main/java/com/pavis/ai/kwp/ioc/client/CallbackClient.java

@@ -7,8 +7,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "ioc-callback", url = "https://baidu-agency.ddp.demo.aks.chilunyc.com", configuration = CallbackClient.CallbackConfig.class)
-// @FeignClient(name = "ioc-callback", url = "https://gateway.app.dandanpai.cn/services/audit-service", configuration = CallbackClient.CallbackConfig.class)
+@FeignClient(name = "ioc-callback", url = "${ioc.callback-url}", configuration = CallbackClient.CallbackConfig.class)
 public interface CallbackClient {
 
     // @PostMapping(value = "/api/receive-result", consumes = MediaType.APPLICATION_JSON_VALUE)

src/main/java/com/pavis/ai/kwp/ioc/common/utils/DateTimeUtils.java

@@ -21,4 +21,9 @@ public class DateTimeUtils {
     public static String dateTimeNow() {
         return DateTime.now().toString(Constants.DEFAULT_DATETIME_FORMAT);
     }
+
+    public static String nonEtDatetime(String uploadTime) {
+        DateTime ut = DateTime.parse(uploadTime, DateTimeFormat.forPattern(Constants.DEFAULT_DATETIME_FORMAT));
+        return ut.minusDays(1).withTime(3, 33, 33, 0).toString(Constants.DEFAULT_DATETIME_FORMAT);
+    }
 }

src/main/java/com/pavis/ai/kwp/ioc/service/impl/CallbackServiceImpl.java

@@ -89,9 +89,9 @@ public class CallbackServiceImpl implements CallbackService {
     public CbLog initCbLog(RecLog recLog) {
         CbLog cbLog = cbLogMapper.selectById(recLog.getUploadId());
         if (StringUtils.isNotBlank(recLog.getTError())) {
-            String[] err = StringUtils.split(recLog.getTError(), ":");
-            cbLog.setCode(err[0]);
-            cbLog.setMessage(err[1]);
+            // String[] err = StringUtils.split(recLog.getTError(), ":");
+            cbLog.setCode(StringUtils.substringBefore(recLog.getTError(), ":"));
+            cbLog.setMessage(StringUtils.substringAfter(recLog.getTError(), ":"));
         } else {
             cbLog.setCode(Constants.OP_CODE_OCR_SUCCESS);
             cbLog.setMessage("识别成功");

src/main/java/com/pavis/ai/kwp/ioc/service/impl/OcrTripServiceImpl.java

@@ -6,14 +6,8 @@ import com.pavis.ai.kwp.ioc.common.event.OcrEvent;
 import com.pavis.ai.kwp.ioc.common.utils.DateTimeUtils;
 import com.pavis.ai.kwp.ioc.dto.meta.OcrRetDto;
 import com.pavis.ai.kwp.ioc.dto.meta.OcrTripDto;
-import com.pavis.ai.kwp.ioc.mapper.OcrTripDetMapper;
-import com.pavis.ai.kwp.ioc.mapper.OcrTripMapper;
-import com.pavis.ai.kwp.ioc.mapper.OcrTripProbMapper;
-import com.pavis.ai.kwp.ioc.mapper.TripLogMapper;
-import com.pavis.ai.kwp.ioc.model.OcrTrip;
-import com.pavis.ai.kwp.ioc.model.OcrTripDet;
-import com.pavis.ai.kwp.ioc.model.OcrTripProb;
-import com.pavis.ai.kwp.ioc.model.TripLog;
+import com.pavis.ai.kwp.ioc.mapper.*;
+import com.pavis.ai.kwp.ioc.model.*;
 import com.pavis.ai.kwp.ioc.service.OcrTripService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -38,6 +32,8 @@ public class OcrTripServiceImpl extends ServiceImpl<OcrTripMapper, OcrTrip> impl
     private OcrTripDetMapper ocrTripDetMapper;
     @Autowired
     private OcrTripProbMapper ocrTripProbMapper;
+    @Autowired
+    private UpMainMapper upMainMapper;
 
     @Override
     public void saveOcrRet(OcrRetDto ret) {
@@ -51,6 +47,14 @@ public class OcrTripServiceImpl extends ServiceImpl<OcrTripMapper, OcrTrip> impl
                     // 强制默认值为1
                     ocrTrip.setGlobalProb("1");
                 }
+                // 处理网购小票日期
+                if (StringUtils.isBlank(ocrTrip.getPurchaseDate())) {
+                    // 查小票类型
+                    UpMain upMain = upMainMapper.selectById(ocrTrip.getUploadId());
+                    if (upMain.getTripType().equals(Constants.TRIP_TYPE_ET)) {
+                        ocrTrip.setPurchaseDate(DateTimeUtils.nonEtDatetime(upMain.getUploadTime()));
+                    }
+                }
                 baseMapper.insert(ocrTrip);
             }
             List<OcrTripDet> dets = dto.adapteDetails(ret.getUploadId());

src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       max-file-size: 50MB
       max-request-size: 20MB
   profiles:
-    active: test
+    active: prod
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   typeAliasesPackage: com.pavis.ai.kwp.ioc.model