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

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -496,7 +496,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         for (int i = 0; i < agreementProductCosts.size(); i++) {
             //判断是否匹配
             System.out.printf("费用因子匹配开始:" + agreementProductCosts.get(i).getId() + "\n");
-            System.out.printf("费用因子备注:" + agreementProductCosts.get(i).getCostsDescription() + "\n");
+            System.out.println("费用因子备注:" + agreementProductCosts.get(i).getCostsDescription() + "\n");
             if (judgements(agreementProductCosts.get(i).getCostsAttrLinks(), undwrtRulesAttrList, ruleAttrMappingVoList)) {
                 //返回 费用id   如果需要匹配非车的情况  将返回值返回list 后赛选
                 return agreementProductCosts.get(i).getId();

src/main/java/com/ydtech/modules/order/controller/GuoRenOrderApiController.java

@@ -69,6 +69,7 @@ public class GuoRenOrderApiController {
     @PostMapping(value = "/uploadImage")
     public HttpResult uploadImage(@RequestSingleParam(value = "companyId") String companyId) {
         return guorenOrderApiService.uploadImageApi(companyId);
+//        return HttpResult.ok("ok");
     }
 
     @ApiOperation(value = "支付")

src/main/java/com/ydtech/modules/order/controller/ZhongMeiOrderApiController.java

@@ -75,6 +75,7 @@ public class ZhongMeiOrderApiController {
     @ApiOperation(value = "提交影像信息")
     public HttpResult<Object> submitImage(@RequestSingleParam(value = "companyId") String companyId) {
         return this.zhongMeiOrderApiService.submitImage(companyId);
+//        return HttpResult.ok("ok");
     }
 
     @PostMapping("/getPolicyPrint")