修改购物车字段

mp-admin/pom.xml

@@ -60,7 +60,7 @@
             <groupId>com.qs.mp</groupId>
             <artifactId>mp-generator</artifactId>
         </dependency>
-        
+
         <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -76,7 +76,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-        
+
 
     </dependencies>
 
@@ -97,17 +97,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

mp-admin/src/main/resources/application-dev.yml

@@ -11,9 +11,9 @@ pay:
 # 数据源配置
 spring:
     redis:
-        host: 113.31.162.168
+        host: 110.40.236.236
         port: 6379
-        password: CjPfyr77Bbdfg
+        password: '@9(s2sWppxkess'
         # 连接超时时间（毫秒）
         timeout: 10000
         jedis:
@@ -32,16 +32,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://113.31.162.168:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
                 username: mptest
                 password: wan789*@dfhzHu518!dr2xosn
                 # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -61,7 +61,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true

mp-admin/src/main/resources/application-test.yml

@@ -21,9 +21,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 113.31.162.168
+      host: 110.40.236.236
       port: 6379
-      password: CjPfyr77Bbdfg
+      password: '@9(s2sWppxkess'
       # 连接超时时间（毫秒）
       timeout: 10000
       jedis:
@@ -42,7 +42,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://113.31.162.168:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
                 username: mptest
                 password: wan789*@dfhzHu518!dr2xosn
             # 从库数据源

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -69,11 +69,17 @@ public class TicketBox implements Serializable {
   private Integer saleQty;
 
   /**
-   * 盲票包采购单价
+   * 盲票包原价
    */
   @TableField("box_price")
   private Integer boxPrice;
 
+  /**
+   * 盲票包售价
+   */
+  @TableField("box_sale_price")
+  private Integer boxSalePrice;
+
   /**
    * 每包盲票张数
    */

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCart.java

@@ -40,8 +40,8 @@ public class ChannelCart implements Serializable {
   /**
    * 订购包数
    */
-  @TableField("pkg_num")
-  private Integer pkgNum;
+  @TableField("order_num")
+  private Integer orderNum;
 
   /**
    * 创建时间

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrderItem.java

@@ -58,14 +58,14 @@ public class ChannelOrderItem implements Serializable {
   /**
    * 盲票包数量
    */
-  @TableField("pkg_num")
-  private Integer pkgNum;
+  @TableField("order_num")
+  private Integer orderNum;
 
   /**
    * 盲票包单价
    */
-  @TableField("pkg_price")
-  private Integer pkgPrice;
+  @TableField("sale_price")
+  private Integer salePrice;
 
   /**
    * 创建时间

mp-service/src/main/resources/mapper/admin/TicketBoxMapper.xml

@@ -13,6 +13,7 @@
         <result column="quantity" property="quantity" />
         <result column="sale_qty" property="saleQty" />
         <result column="box_price" property="boxPrice" />
+        <result column="box_sale_price" property="boxSalePrice" />
         <result column="pkg_unit" property="pkgUnit" />
         <result column="pkg_qty" property="pkgQty" />
         <result column="sale_pkg_qty" property="salePkgQty" />
@@ -26,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, status, created_time, updated_time
+        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, box_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, status, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/channel/ChannelCartMapper.xml

@@ -7,14 +7,14 @@
         <id column="id" property="id" />
         <result column="channel_id" property="channelId" />
         <result column="box_id" property="boxId" />
-        <result column="pkg_num" property="pkgNum" />
+        <result column="order_num" property="orderNum" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, box_id, pkg_num, created_time, updated_time
+        id, channel_id, box_id, order_num, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/channel/ChannelOrderItemMapper.xml

@@ -10,15 +10,15 @@
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
         <result column="box_id" property="boxId" />
-        <result column="pkg_num" property="pkgNum" />
-        <result column="pkg_price" property="pkgPrice" />
+        <result column="order_num" property="orderNum" />
+        <result column="sale_price" property="salePrice" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, channel_id, title, pic_url, box_id, pkg_num, pkg_price, created_time, updated_time
+        id, order_id, channel_id, title, pic_url, box_id, order_num, sale_price, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>