Browse Source

商品按sort排序

master
lzh 2 years ago
parent
commit
7bc4a94b80
  1. 4
      mallplus-admin/pom.xml
  2. 8
      mallplus-admin/src/main/resources/application-dev.properties
  3. 11
      mallplus-mbg/pom.xml
  4. 2
      mallplus-portal/pom.xml
  5. 3
      mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
  6. 4
      mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue

4
mallplus-admin/pom.xml

@ -62,11 +62,11 @@
<artifactId>gecco</artifactId> <artifactId>gecco</artifactId>
<version>1.0.8</version> <version>1.0.8</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson <version>1.2.59</version> -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.59</version> <version>1.2.62</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

8
mallplus-admin/src/main/resources/application-dev.properties

@ -18,11 +18,11 @@ spring.redis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=0 spring.redis.timeout=0
#===redis end=== #===redis end===
#spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=root #spring.datasource.password=root
#spring.datasource.password=1LAiGz$t1*Iw spring.datasource.password=1LAiGz$t1*Iw
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.initialSize=5 spring.datasource.druid.initialSize=5

11
mallplus-mbg/pom.xml

@ -18,7 +18,8 @@
<mybatis-plus-boot-starter.version>3.0-RC3</mybatis-plus-boot-starter.version> <mybatis-plus-boot-starter.version>3.0-RC3</mybatis-plus-boot-starter.version>
<HikariCP.version>3.2.0</HikariCP.version> <HikariCP.version>3.2.0</HikariCP.version>
<alipay.version>3.1.0</alipay.version> <alipay.version>3.1.0</alipay.version>
<hutool.version>[4.1.12,)</hutool.version> <!-- <hutool.version>[4.1.12,)</hutool.version>-->
<hutool.version>5.0.4</hutool.version>
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version> <qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
<mail.version>1.4.7</mail.version> <mail.version>1.4.7</mail.version>
<oshi.version>3.9.1</oshi.version> <oshi.version>3.9.1</oshi.version>
@ -113,12 +114,12 @@
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.6.1</version> <version>2.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version> <version>2.7.0</version>
</dependency> </dependency>
<!-- 阿里短信接口 --> <!-- 阿里短信接口 -->
<dependency> <dependency>
@ -142,10 +143,12 @@
<version>3.2.1</version> <version>3.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- <version>4.0.0</version>-->
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId> <artifactId>easypoi-annotation</artifactId>
<version>4.0.0</version> <version>3.2.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
mallplus-portal/pom.xml

@ -77,7 +77,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.60</version> <version>1.2.62</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>

3
mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java

@ -385,7 +385,8 @@ public class SingePmsController extends ApiBaseAction {
if (ValidatorUtils.notEmpty(schoolId) && schoolId > 0) { if (ValidatorUtils.notEmpty(schoolId) && schoolId > 0) {
product.setSchoolId(schoolId); product.setSchoolId(schoolId);
} }
String orderColum = "create_time"; // String orderColum = "create_time";
String orderColum = "sort";
if (ValidatorUtils.notEmpty(product.getSort())) { if (ValidatorUtils.notEmpty(product.getSort())) {
if (product.getSort() == 1) { if (product.getSort() == 1) {
orderColum = "sale"; orderColum = "sale";

4
mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue

@ -119,9 +119,9 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="排序"> <el-form-item label="排序">
<el-input v-model="value.sort"></el-input> <el-input v-model="value.sort"></el-input>
</el-form-item> --> </el-form-item>
<el-form-item style="text-align: center"> <el-form-item style="text-align: center">
<el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步</el-button> <el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步</el-button>
</el-form-item> </el-form-item>

Loading…
Cancel
Save