优化运费管理

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

@@ -86,6 +86,10 @@ public class TbCfStationItemEntity implements Serializable {
      * 供应商
      */
     private String supplier;
+    /**
+     * 国家
+     */
+    private String country;
     /**
      * sku图片集合
      */
@@ -132,6 +136,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemId() {
         return itemId;
     }
+
     /**
      * 设置：商品编号
      */
@@ -145,6 +150,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemCode() {
         return itemCode;
     }
+
     /**
      * 设置：商品名字
      */
@@ -158,6 +164,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemName() {
         return itemName;
     }
+
     /**
      * 设置：商品标题
      */
@@ -171,6 +178,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemBrief() {
         return itemBrief;
     }
+
     /**
      * 设置：商品一级分类
      */
@@ -184,6 +192,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemCategory() {
         return itemCategory;
     }
+
     /**
      * 设置：商品价格
      */
@@ -197,6 +206,7 @@ public class TbCfStationItemEntity implements Serializable {
     public BigDecimal getItemPrice() {
         return itemPrice;
     }
+
     /**
      * 设置：商品折扣价
      */
@@ -210,6 +220,7 @@ public class TbCfStationItemEntity implements Serializable {
     public BigDecimal getDiscountPrice() {
         return discountPrice;
     }
+
     /**
      * 设置：成本价
      */
@@ -223,6 +234,7 @@ public class TbCfStationItemEntity implements Serializable {
     public BigDecimal getCostPrice() {
         return costPrice;
     }
+
     /**
      * 设置：商品链接
      */
@@ -236,6 +248,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemUrl() {
         return itemUrl;
     }
+
     /**
      * 设置：商品图片
      */
@@ -249,6 +262,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemImg() {
         return itemImg;
     }
+
     /**
      * 设置：搜索关键字
      */
@@ -262,6 +276,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemTags() {
         return itemTags;
     }
+
     /**
      * 设置：商品标签
      */
@@ -275,6 +290,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemLabel() {
         return itemLabel;
     }
+
     /**
      * 设置：浏览人数
      */
@@ -288,6 +304,7 @@ public class TbCfStationItemEntity implements Serializable {
     public Long getItemNum() {
         return itemNum;
     }
+
     /**
      * 设置：收藏人数
      */
@@ -301,6 +318,7 @@ public class TbCfStationItemEntity implements Serializable {
     public Long getItemCollectionNum() {
         return itemCollectionNum;
     }
+
     /**
      * 设置：商品库存
      */
@@ -314,6 +332,7 @@ public class TbCfStationItemEntity implements Serializable {
     public Long getItemCount() {
         return itemCount;
     }
+
     /**
      * 设置：商品规格
      */
@@ -327,6 +346,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemSku() {
         return itemSku;
     }
+
     /**
      * 设置：是否置顶 Y:是 N:否
      */
@@ -340,6 +360,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemTop() {
         return itemTop;
     }
+
     /**
      * 设置：供应商
      */
@@ -353,6 +374,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getSupplier() {
         return supplier;
     }
+
     /**
      * 设置：sku图片集合
      */
@@ -366,6 +388,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getSkuImgs() {
         return skuImgs;
     }
+
     /**
      * 设置：所属平台
      */
@@ -379,6 +402,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getPlatformCode() {
         return platformCode;
     }
+
     /**
      * 设置：平台名
      */
@@ -392,6 +416,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getPlatformName() {
         return platformName;
     }
+
     /**
      * 设置：状态 0、删除 1、上架 2、下架
      */
@@ -405,6 +430,7 @@ public class TbCfStationItemEntity implements Serializable {
     public Integer getEnableFlag() {
         return enableFlag;
     }
+
     /**
      * 设置：创建日期
      */
@@ -418,6 +444,7 @@ public class TbCfStationItemEntity implements Serializable {
     public Date getCreateTime() {
         return createTime;
     }
+
     /**
      * 设置：商品二级分类
      */
@@ -431,6 +458,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemCategorytwo() {
         return itemCategorytwo;
     }
+
     /**
      * 设置：商品品名
      */
@@ -444,6 +472,7 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemDescritionId() {
         return itemDescritionId;
     }
+
     /**
      * 设置：创建人
      */
@@ -457,4 +486,12 @@ public class TbCfStationItemEntity implements Serializable {
     public String getCreator() {
         return creator;
     }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java

@@ -123,6 +123,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         tbCfStationItem.setItemNum(0L);
         tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
         tbCfStationItem.setSupplier(itemSkus.getSupplier());
+        tbCfStationItem.setCountry(itemSkus.getCountry());
         tbCfStationItem.setItemPrice(itemSkus.getItemPrice());
         tbCfStationItem.setDiscountPrice(itemSkus.getDiscountPrice());
         tbCfStationItem.setCostPrice(itemSkus.getCostPrice());
@@ -264,6 +265,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             tbCfStationItem.setCostPrice(itemSkus.getCostPrice());
             tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
             tbCfStationItem.setSupplier(itemSkus.getSupplier());
+            tbCfStationItem.setCountry(itemSkus.getCountry());
             tbCfStationItem.setItemBrief(itemSkus.getItemBrief());
             tbCfStationItem.setItemName(itemSkus.getItemName());
             tbCfStationItem.setItemCode(itemSkus.getItemCode());

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

@@ -61,13 +61,15 @@
         `handling_fee`,
         `tariff`,
         `country_code`,
-        `country`,
-        `status`,
+        c.country_name country,
+        t.`status`,
         `is_default`,
         `postage_free_price`,
-        `create_time`,
-        `update_time`
-        from tb_cf_express_template
+        t.`create_time`,
+        t.`update_time`
+        from tb_cf_express_template t
+        inner join country c
+        on t.country=c.id
         WHERE 1=1
         <if test="name != null and name.trim() != ''">
             AND template_title LIKE concat('%',#{name},'%')
@@ -135,21 +137,21 @@
     <update id="update" parameterType="com.platform.entity.TbCfExpressTemplateEntity">
         update tb_cf_express_template
         <set>
-            <if test="templateTitle != null">`template_title` = #{templateTitle}, </if>
-            <if test="type != null">`type` = #{type}, </if>
-            <if test="itemCategoryId != null">`item_category_id` = #{itemCategoryId}, </if>
-            <if test="startNum != null">`start_num` = #{startNum}, </if>
-            <if test="expressFee != null">`express_fee` = #{expressFee}, </if>
-            <if test="continuationNum != null">`continuation_num` = #{continuationNum}, </if>
-            <if test="continuationFee != null">`continuation_fee` = #{continuationFee}, </if>
-            <if test="handlingFee != null">`handling_fee` = #{handlingFee}, </if>
-            <if test="tariff != null">`tariff` = #{tariff}, </if>
-            <if test="countryCode != null">`country_code` = #{countryCode}, </if>
-            <if test="country != null">`country` = #{country}, </if>
-            <if test="status != null">`status` = #{status}, </if>
-            <if test="isDefault != null">`is_default` = #{isDefault}, </if>
-            <if test="postageFreePrice != null">`postage_free_price` = #{postageFreePrice}, </if>
-            <if test="createTime != null">`create_time` = #{createTime}, </if>
+            <if test="templateTitle != null">`template_title` = #{templateTitle},</if>
+            <if test="type != null">`type` = #{type},</if>
+            <if test="itemCategoryId != null">`item_category_id` = #{itemCategoryId},</if>
+            <if test="startNum != null">`start_num` = #{startNum},</if>
+            <if test="expressFee != null">`express_fee` = #{expressFee},</if>
+            <if test="continuationNum != null">`continuation_num` = #{continuationNum},</if>
+            <if test="continuationFee != null">`continuation_fee` = #{continuationFee},</if>
+            <if test="handlingFee != null">`handling_fee` = #{handlingFee},</if>
+            <if test="tariff != null">`tariff` = #{tariff},</if>
+            <if test="countryCode != null">`country_code` = #{countryCode},</if>
+            <if test="country != null">`country` = #{country},</if>
+            <if test="status != null">`status` = #{status},</if>
+            <if test="isDefault != null">`is_default` = #{isDefault},</if>
+            <if test="postageFreePrice != null">`postage_free_price` = #{postageFreePrice},</if>
+            <if test="createTime != null">`create_time` = #{createTime},</if>
             <if test="updateTime != null">`update_time` = #{updateTime}</if>
         </set>
         where template_id = #{templateId}

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

@@ -22,6 +22,7 @@
         <result property="itemSku" column="item_sku"/>
         <result property="itemTop" column="item_top"/>
         <result property="supplier" column="supplier"/>
+        <result property="country" column="country"/>
         <result property="skuImgs" column="sku_imgs"/>
         <result property="platformCode" column="platform_code"/>
         <result property="platformName" column="platform_name"/>
@@ -51,6 +52,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
+			 country,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -82,6 +84,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
+			 country,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -130,6 +133,7 @@
         i.item_descrition_id,
         i.item_top,
         i.supplier,
+        i.country,
         i.sku_imgs,
         i.creator,
         d.descripition_name dname,
@@ -246,6 +250,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
+			country,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -273,6 +278,7 @@
 			#{itemSku},
 			#{itemTop},
 			#{supplier},
+			#{country},
 			#{skuImgs},
 			#{platformCode},
 			#{platformName},
@@ -303,6 +309,7 @@
             <if test="itemSku != null">`item_sku` = #{itemSku},</if>
             <if test="itemTop != null">`item_top` = #{itemTop},</if>
             <if test="supplier != null">`supplier` = #{supplier},</if>
+            <if test="country != null">`country` = #{country},</if>
             <if test="skuImgs != null">`sku_imgs` = #{skuImgs},</if>
             <if test="platformCode != null">`platform_code` = #{platformCode},</if>
             <if test="platformName != null">`platform_name` = #{platformName},</if>
@@ -338,4 +345,4 @@
             #{itemId}
         </foreach>
     </select>
-</mapper>
+</mapper>
\ No newline at end of file

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfexpresstemplate.html

@@ -61,8 +61,12 @@
             <Form-item label="关税" prop="tariff">
                 <i-input v-model="tbCfExpressTemplate.tariff" placeholder="关税" style="width:300px"/>
             </Form-item>
-            <Form-item label="国家" prop="country">
-                <i-input v-model="tbCfExpressTemplate.country" placeholder="国家" style="width:300px"/>
+            <Form-item label="国家" prop="country" >
+                <i-select label="请选择" v-model="tbCfExpressTemplate.country" style="width:300px">
+                    <i-option v-for="c in countryList" :key='c.id'
+                              :value="c.id">{{c.countryName}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="免邮价格" prop="postageFreePrice">
                 <i-input v-model="tbCfExpressTemplate.postageFreePrice" placeholder="免邮价格" style="width:300px"/>

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -175,6 +175,7 @@
             justify-content: space-between;
             align-items: center;
         }
+
         .pp-flex-center {
             display: flex;
             justify-content: center;
@@ -420,10 +421,12 @@
             left: 50%;
             transform: translateX(-50%);
         }
-        .confirm-btn-price{
-            padding:20px;
+
+        .confirm-btn-price {
+            padding: 20px;
         }
-        .confirm-btn-price>:first-child{
+
+        .confirm-btn-price > :first-child {
             margin-right: 10px;
         }
 
@@ -555,7 +558,7 @@
             <i-button class="fixed-submit preview"
                       v-show="show_paste_btn"
                       @click="paste()"
-                      >粘贴
+            >粘贴
             </i-button>
             <i-button class="fixed-submit preview" v-show="tbCfStationItem.itemId"
                       @click="preview(tbCfStationItem.itemId,'pc')" type="primary">预览
@@ -597,7 +600,7 @@
             </div>
             <div class="pp-popup-wrapper" v-if="tagshow">
                 <div class="pp-popup-mask"></div>
-                    <div class="pp-popup-container">
+                <div class="pp-popup-container">
                     <h3 class="pp-text-center">数据选择</h3>
                     <div class="pp-tags-section" v-for="(element,index) in tagLists" :key="index">
                         <i-button
@@ -662,6 +665,13 @@
             <Form-item label="供应商" prop="supplier" style="width: 800px">
                 <i-input v-model="tbCfStationItem.supplier" placeholder="供应商"/>
             </Form-item>
+            <Form-item label="国家" prop="country" style="width: 800px">
+                <i-select label="请选择" v-model="tbCfStationItem.country">
+                    <i-option v-for="c in countryList" :key='c.id'
+                              :value="c.id">{{c.countryName}}
+                    </i-option>
+                </i-select>
+            </Form-item>
             <Form-item label="商品一级分类" prop="itemCategory" style="width: 800px">
                 <i-select placeholder="请选择" v-model="tbCfStationItem.itemCategory" @on-change="changeGoodstype">
                     <i-option v-for="(el,i) in Goodstype" :key='i'
@@ -892,12 +902,13 @@
                                         </div>
                                         <div>
                                             <h3 style="margin:20px 0;">属性价格</h3>
-                                            <i-input ref="amount" type="number" @on-change="changeBatch($event,'amount')"
+                                            <i-input ref="amount" type="number"
+                                                     @on-change="changeBatch($event,'amount')"
                                                      placeholder="属性价格"/>
                                         </div>
                                         <div>
                                             <h3 style="margin:20px 0;">属性库存</h3>
-                                            <i-input  ref="count" type="number" @on-change="changeBatch($event,'count')"
+                                            <i-input ref="count" type="number" @on-change="changeBatch($event,'count')"
                                                      placeholder="属性库存"/>
                                         </div>
                                         <div class="pp-flex-center confirm-btn-price">
@@ -984,12 +995,12 @@
                     @on-ok="delAttr">
                 <p>确认删除此属性</p>
             </Modal>
-<!--            粘贴提示-->
+            <!--            粘贴提示-->
             <Modal
                     v-model="paste_modal"
                     title="确认粘贴？"
                     @on-ok="comfirmPaste()"
-                    >
+            >
                 <h4>粘贴内容如下:</h4>
                 <br/>
                 <p>1.搜索关键词。</p>
@@ -1035,4 +1046,4 @@
         };
     </script>
 </body>
-</html>
+</html>
\ No newline at end of file

platform-admin/src/main/webapp/js/sys/country.js

@@ -4,7 +4,7 @@ $(function () {
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '国家名称', name: 'countryName', index: 'country_name', width: 80},
-			{label: '状态', name: 'status', index: 'status', width: 80},
+			{label: '状态', name: 'status', index: 'status', width: 80,formatter:statusFormat1},
 			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}
 			]
     });

platform-admin/src/main/webapp/js/sys/tbcfexpresstemplate.js

@@ -70,6 +70,7 @@ let vm = new Vue({
             value: 1,
             label: '计重'
         }],
+        countryList: [],
         showList: true,
         title: null,
         tbCfExpressTemplate: {},
@@ -192,5 +193,12 @@ let vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         }
+    },
+    created(){
+        $.get('../country/queryAll', res => {
+            console.log('国家',JSON.parse(res))
+            vm.countryList = JSON.parse(res).list;
+        })
     }
+
 });

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -28,6 +28,7 @@ $(function () {
 let vm = new Vue({
     el: '#rrapp',
     data: {
+        countryList: [],
         modal: false,
         showList: true,
         title: null,
@@ -997,6 +998,10 @@ let vm = new Vue({
         $.get('../tbcfgoodstype/queryAll', res => {
             this.Goodstype = res.list;
         })
+        $.get('../country/queryAll', res => {
+            console.log('国家',JSON.parse(res))
+            vm.countryList = JSON.parse(res).list;
+        })
         $.get('../tbcfstationitem/queryCreator', res => {
             let parse = JSON.parse(res);
             this.creatorList = parse.list;
@@ -1010,6 +1015,7 @@ let vm = new Vue({
                 this.serverSkuAttr.push(item.categoryDesc)
             })
         })
+
     },
     mounted() {
         this.$nextTick(() => {
@@ -1019,4 +1025,4 @@ let vm = new Vue({
             });
         })
     }
-});
+});
\ No newline at end of file