无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/config/InvoiceWebMvcConfigurer.java

@@ -25,7 +25,32 @@ public class InvoiceWebMvcConfigurer extends WebMvcConfigurationSupport {
                 .addPathPatterns("/**");
         super.addInterceptors(registry);
     }
+    /**
+     * 支持跨域访问
+     * @param registry
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
+                .allowCredentials(true);
+    }
+    /**
+     * 发现如果继承了WebMvcConfigurationSupport，则在yml中配置的相关内容会失效。
+     * 需要重新指定静态资源
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
 
+        super.addResourceHandlers(registry);
+    }
     @Bean
     public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() {
         return new CurrentUserMethodArgumentResolver();

src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java

@@ -69,7 +69,7 @@ public class CustomerController {
      */
     @PostMapping("/findCustomer")
     @ApiOperation(value="分页查询客户", notes="分页查询客户")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR getCustomersByPage(Page page, Customer customer) {
 
         return new RespR(customerService.findAllCustomers(page, customer));

src/main/java/com/jkcredit/invoice/controller/business/SelfCarController.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
+import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
@@ -56,7 +57,8 @@ public class SelfCarController {
     SelfCarInvoiceService selfCarInvoiceService;
     @Autowired
     SelfCarCalculateInfoService selfCarCalculateInfoService;
-
+    @Autowired
+    SellCarTradeMapper sellCarTradeMapper;
     @Autowired
     CustomerService customerService;
     /**
@@ -147,6 +149,7 @@ public class SelfCarController {
             return new RespR(false,e.getMessage());
         }
     }
+
     /**
      * 分页查询自有车交易信息
      *
@@ -156,9 +159,14 @@ public class SelfCarController {
     @PostMapping("/updateTrades")
     @ApiOperation(value="更新交易id状态", notes="更新交易id状态")
     @LoginRequired
-    public void updateTrades( String selfCarTradesStr) {
+    public void updateTrades( String selfCarTradesStr,String companyName) {
         try {
+
             List<SelfCarTrade>  selfCarTrades = JSON.parseArray(selfCarTradesStr,SelfCarTrade.class);
+            if(selfCarTrades== null || selfCarTrades.size()==0){
+                selfCarTrades = sellCarTradeMapper.selectByStatus("2",companyName);
+
+            }
             selfCarTradeService.updateTrades(selfCarTrades);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/jkcredit/invoice/mapper/waybill/SellCarTradeMapper.java

@@ -23,7 +23,7 @@ public interface SellCarTradeMapper extends BaseMapper<SelfCarTrade> {
     List<SelfCarTrade> selectByTradeId(String tradeId);
     List<SelfCarTrade> selectByCardIdByStatus(SelfCarTrade record);
     List<SelfCarTrade> selectByCardId(String cardId);
-    List<SelfCarTrade> selectByStatus(String status);
+    List<SelfCarTrade> selectByStatus(@Param("status") String status,@Param("company") String company);
     int upDateCompany(CompanyVo companyVo);
 
 }

src/main/java/com/jkcredit/invoice/service/selfcar/impl/SelfCarTradeServiceImpl.java

@@ -56,9 +56,6 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,Self
     @Override
     public boolean updateTrades(List<SelfCarTrade> selfCarTrades) {
         Map<String,TradeRequestVo> map = new HashMap<>();
-        if(selfCarTrades== null || selfCarTrades.size()==0){
-            selfCarTrades = sellCarTradeMapper.selectByStatus("2");
-        }
         selfCarTrades.forEach(selfCarTrade -> {
             TradeRequestVo tradeRequestVo = map.get(selfCarTrade.getCardId());
             if(tradeRequestVo == null){

src/main/resources/mapper/calculateinfor/NoCarCalculateInforMapper.xml

@@ -57,8 +57,6 @@
                 and calculateTime BETWEEN #{calculateInfor.calculateStart} and #{calculateInfor.calculateEnd}
             </if>
         </where>
-
-           ORDER BY id desc
     </select>
     <resultMap id="staticResultMap" type="java.util.Map">
         <result column="customId" property="customId"/>
@@ -75,7 +73,7 @@
                 and  customId = BINARY #{calculateInfor.customId}
             </if>
             <if test="calculateInfor.buyerName != null and calculateInfor.buyerName != ''">
-                and  buyerName LIKE BINARY CONCAT('%',#{calculateInfor.buyerName},'%')
+                and  buyerName =#{calculateInfor.buyerName}
             </if>
             <if test="calculateInfor.buyerTaxpayerCode != null and calculateInfor.buyerTaxpayerCode != ''">
                 and  buyerTaxpayerCode = BINARY #{calculateInfor.buyerTaxpayerCode}

src/main/resources/mapper/customer/CustomerCarRecMapper.xml

@@ -29,9 +29,10 @@
     select
     <include refid="Base_Column_List" />
     from  t_customer_carRec
-    <where>
+    where
+      rec_status=1
       <if test="query.customerName != null">
-         customer_name = BINARY #{query.customerName,jdbcType=VARCHAR}
+        and  customer_name = BINARY #{query.customerName,jdbcType=VARCHAR}
       </if>
       <if test="query.carNum != null and query.carNum != ''">
         and  car_num = BINARY #{query.carNum}
@@ -57,7 +58,7 @@
             or fail_time  BETWEEN #{query.startTime} and #{query.endTime}
         )
       </if>
-    </where>
+
     ORDER BY succ_time||fail_time DESC
   </select>
   <select id="selectByCustName" parameterType="java.lang.String" resultMap="BaseResultMap">

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -139,11 +139,15 @@
         from t_SellCarTrade
         where  cardId = BINARY #{cardId,jdbcType=VARCHAR} and  status = #{status,jdbcType=VARCHAR}
     </select>
-    <select id="selectByStatus" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <select id="selectByStatus" resultMap="BaseResultMap" parameterType="java.util.Map" >
         select
         <include refid="baseSql" />
         from t_SellCarTrade
         where  status = #{status,jdbcType=VARCHAR}
+        <if test="company != null and company != ''">
+            and  companyName = #{company,jdbcType=VARCHAR}
+        </if>
+
     </select>
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
         UPDATE t_SellCarTrade set companyName = #{newCompanyName} where companyName = #{oldCompanyName}