优化分类导航栏

platform-admin/src/main/java/com/platform/entity/TbCfClassificationEntity.java

@@ -36,7 +36,7 @@ public class TbCfClassificationEntity implements Serializable {
     /**
      * 是否展示
      */
-    private String isShow;
+    private Integer isShow;
     /**
      * 创建时间
      */
@@ -46,6 +46,10 @@ public class TbCfClassificationEntity implements Serializable {
      */
     private Date updateTime;
 
+    private Integer type;
+
+    private String categoryId;
+
     /**
      * 设置：首页分类导航ID
      */
@@ -111,19 +115,15 @@ public class TbCfClassificationEntity implements Serializable {
     public Integer getSort() {
         return sort;
     }
-    /**
-     * 设置：是否展示
-     */
-    public void setIsShow(String isShow) {
-        this.isShow = isShow;
-    }
 
-    /**
-     * 获取：是否展示
-     */
-    public String getIsShow() {
+    public Integer getIsShow() {
         return isShow;
     }
+
+    public void setIsShow(Integer isShow) {
+        this.isShow = isShow;
+    }
+
     /**
      * 设置：创建时间
      */
@@ -150,4 +150,20 @@ public class TbCfClassificationEntity implements Serializable {
     public Date getUpdateTime() {
         return updateTime;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(String categoryId) {
+        this.categoryId = categoryId;
+    }
 }

platform-admin/src/main/java/com/platform/task/FeeTask.java

@@ -24,19 +24,24 @@ public class FeeTask {
 
     @Scheduled(cron = "0 0 0/1 * * ? ")
     public void FeeTask() {
-        String url="http://op.juhe.cn/onebox/exchange/currency";
-        Map<String,String> parameters=new HashMap<>();
-        parameters.put("from","CNY");
-        parameters.put("to","USD");
-        parameters.put("key","01a825bc0e074568e7bcec48fdb5f482");
-        String s = HttpUtils.sendGet(url,parameters);
+        String url = "http://op.juhe.cn/onebox/exchange/currency";
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("from", "CNY");
+        parameters.put("to", "USD");
+        parameters.put("key", "01a825bc0e074568e7bcec48fdb5f482");
+        String s = HttpUtils.sendGet(url, parameters);
         JSONArray result = JSONObject.fromObject(s).getJSONArray("result");
-        Map<String,String> map = (Map<String, String>) result.get(1);
-        String result1 = map.get("result").substring(0,4);
-        BigDecimal fee=new BigDecimal(result1);
-        TbCfFeeEntity tbFee =new TbCfFeeEntity();
+        Map<String, String> map = (Map<String, String>) result.get(1);
+        String result1 = map.get("result").substring(0, 4);
+        BigDecimal fee = new BigDecimal(result1);
+        TbCfFeeEntity tbFee = new TbCfFeeEntity();
         tbFee.setFeeId("54sda4fa5dsa4f");
         tbFee.setFeeRate(fee);
         tbCfFeeService.update(tbFee);
     }
+
+    public static void main(String[] args) {
+        String str = "122,253,3555";
+        System.out.println(str.substring(str.lastIndexOf(",") + 1));
+    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfClassificationDao.xml

@@ -12,12 +12,16 @@
         <result property="isShow" column="is_show"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+		<result property="type" column="type"/>
+		<result property="categoryId" column="category_id"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.platform.entity.TbCfClassificationEntity">
 		select
 			`id`,
 			`goodtype_id`,
+			`type`,
+			`category_id`,
 			`class_title`,
 			`picture`,
 			`sort`,
@@ -30,14 +34,16 @@
 
 	<select id="queryList" resultType="com.platform.entity.TbCfClassificationEntity">
 		select
-    		`id`,
-    		`goodtype_id`,
-    		`class_title`,
-    		`picture`,
-    		`sort`,
-    		`is_show`,
-    		`create_time`,
-    		`update_time`
+		`id`,
+		`goodtype_id`,
+		`type`,
+		`category_id`,
+		`class_title`,
+		`picture`,
+		`sort`,
+		`is_show`,
+		`create_time`,
+		`update_time`
 		from tb_cf_classification
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -55,7 +61,7 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from tb_cf_classification
 		WHERE 1=1
@@ -63,11 +69,13 @@
             AND name LIKE concat('%',#{name},'%')
         </if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.platform.entity.TbCfClassificationEntity">
 		insert into tb_cf_classification(
 			`id`,
 			`goodtype_id`,
+			`type`,
+			`category_id`,
 			`class_title`,
 			`picture`,
 			`sort`,
@@ -77,6 +85,8 @@
 		values(
 			#{id},
 			#{goodtypeId},
+			#{type},
+			#{categoryId},
 			#{classTitle},
 			#{picture},
 			#{sort},
@@ -84,11 +94,13 @@
 			#{createTime},
 			#{updateTime})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.platform.entity.TbCfClassificationEntity">
-		update tb_cf_classification 
+		update tb_cf_classification
 		<set>
 			<if test="goodtypeId != null">`goodtype_id` = #{goodtypeId}, </if>
+			<if test="type != null">`type` = #{type}, </if>
+			<if test="categoryId != null">`category_id` = #{categoryId}, </if>
 			<if test="classTitle != null">`class_title` = #{classTitle}, </if>
 			<if test="picture != null">`picture` = #{picture}, </if>
 			<if test="sort != null">`sort` = #{sort}, </if>
@@ -98,16 +110,17 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
+
 	<delete id="delete">
 		delete from tb_cf_classification where id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from tb_cf_classification where id in 
+		delete from tb_cf_classification where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</delete>
 
-</mapper>
+</mapper>
\ No newline at end of file

platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml

@@ -175,6 +175,7 @@
         LEFT JOIN tb_cf_coupon c ON c.coupon_id = o.coupon_id
         WHERE
         r.order_id = #{orderId}
+        order by i.item_id
 	</select>
 
     <select id="queryOrderDeliveryWebList" resultType="com.platform.vo.DeliveryOrderVo">
@@ -203,6 +204,7 @@
 		o.order_id,
 		o.order_no,
 		o.user_name,
+		o.activity_id,
 		f.pay_id,
 		f.pay_way_code,
 		c.coupon_title,