随车物品

.gitignore

@@ -7,7 +7,7 @@ target/
 .settings/
 .classpath
 ace-modules/ace-tool/src/main/resources/application-dev.yml
-src/main/test/**
+/src/main/test/**
 logs/**
 xx-order/xx-order-server/logs/**
 *.log

pom.xml

@@ -45,6 +45,7 @@
         <module>xx-im</module>
         <module>xx-campsite</module>
         <module>xx-activity</module>
+        <module>xx-user-behavior-collect</module>
     </modules>
     <packaging>pom</packaging>
     <developers>

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/CustomerBehaviorNoteDTO.java

@@ -18,7 +18,6 @@ public class CustomerBehaviorNoteDTO implements Serializable {
     @ApiModelProperty("主键id")
     private Integer id;
 
-
     @ApiModelProperty(value = "用户id")
     private String customerId;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateAccompanyingItem.java

@@ -2,6 +2,8 @@ package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class AddOrUpdateAccompanyingItem {
 
@@ -17,6 +19,7 @@ public class AddOrUpdateAccompanyingItem {
      */
     private Integer type;
 
+    private BigDecimal price;
 
     /**
      * 备注

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/AccompanyingItemMapper.java

@@ -12,7 +12,4 @@ public interface AccompanyingItemMapper extends Mapper<AccompanyingItem> {
 
    public List<AccompanyingItem> getByIdList(List<Integer> idList);
 
-   public Integer updateStatusById(AccompanyingItem accompanyingItem);
-
-
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/AccompanyingItemMapper.xml

@@ -4,9 +4,9 @@
 
     <select id="getAllByPage" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.AccompanyingItem">
         select
-        `id`, `type`, `name`, `remark`, `create_time`, `update_time`
+        `id`, `type`, `name`, `remark`,`price`, `create_time`, `update_time`
         from
-             vehicle.accompanying_item
+             `accompanying_item`
         where
           1  = 1
         <if test="name != null and name != ''">
@@ -24,9 +24,9 @@
 
     <select id="getByIdList" parameterType="java.util.List" resultType="com.xxfc.platform.vehicle.entity.AccompanyingItem">
         select
-        `id`, `type`, `name`, `remark`, `create_time`, `update_time`
+        `id`, `type`, `name`,`price`,`remark`, `create_time`, `update_time`
         from
-        vehicle.accompanying_item
+          accompanying_item
         where `id` in
         <foreach collection="list" index="i" item="item" open="(" close=")" separator=",">
             #{item}