提交

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

@@ -9,7 +9,7 @@ import java.util.Date;
  * 表名 tb_cf_station_item
  *
  * @author lipengjun
- * @date 2020-04-07 16:24:13
+ * @date 2020-04-09 12:47:34
  */
 public class TbCfStationItemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -86,6 +86,10 @@ public class TbCfStationItemEntity implements Serializable {
      * 供应商
      */
     private String supplier;
+    /**
+     * sku图片集合
+     */
+    private String skuImgs;
     /**
      * 所属平台
      */
@@ -349,6 +353,19 @@ public class TbCfStationItemEntity implements Serializable {
     public String getSupplier() {
         return supplier;
     }
+    /**
+     * 设置：sku图片集合
+     */
+    public void setSkuImgs(String skuImgs) {
+        this.skuImgs = skuImgs;
+    }
+
+    /**
+     * 获取：sku图片集合
+     */
+    public String getSkuImgs() {
+        return skuImgs;
+    }
     /**
      * 设置：所属平台
      */

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

@@ -96,6 +96,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             skusEntity.setSkuPrice(entity.getSkuPrice());
             skusEntity.setSkuCount(entity.getSkuCount());
             skusEntity.setOrderNum(orederNum);
+            skusEntity.setSkuImg(entity.getSkuImg());
+            skusEntity.setSkuCode(entity.getSkuCode());
             tbCfItemSkusDao.save(skusEntity);
             count += entity.getSkuCount();
             orederNum++;
@@ -197,6 +199,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             skusEntity.setSkuPrice(entity.getSkuPrice());
             skusEntity.setSkuCount(entity.getSkuCount());
             skusEntity.setOrderNum(orederNum);
+            skusEntity.setSkuImg(entity.getSkuImg());
+            skusEntity.setSkuCode(entity.getSkuCode());
             tbCfItemSkusDao.save(skusEntity);
             count += entity.getSkuCount();
             orederNum++;

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

@@ -49,8 +49,10 @@ public class OrderTask {
             if (count == orderDetailList.size()) {
                 synchronized (lock) {
                     TbCfOrderEntity tbCfOrderEntity = tbCfOrderDao.queryObject(order.getOrderId());
-                    tbCfOrderEntity.setDeliveryFlag(10);
-                    tbCfOrderDao.update(tbCfOrderEntity);
+                    if (tbCfOrderEntity != null) {
+                        tbCfOrderEntity.setDeliveryFlag(10);
+                        tbCfOrderDao.update(tbCfOrderEntity);
+                    }
                 }
             }
         }

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

@@ -124,6 +124,7 @@
             margin-top: 15px;
             margin-left: 15px;
         }
+
         .querydatas {
             margin-top: 15px;
             margin-left: 15px;
@@ -576,6 +577,13 @@
                         <h4>预览</h4>
                         <transition-group tag="ul" name="slide">
                             <li class="prev-li" v-for="(el,i) in prevItem" :key="i">
+                                <div class="prev-picture">
+                                    <spn>图片</spn>
+                                    <i-input  size="small" type="file" @change="tirggerFile($event)"/>
+                                    <div>
+                                        <img v-bind:src="el.skuImg" style="width:50px;height:50px;"/>
+                                    </div>
+                                </div>
                                 <div class="prev-attr">
                                     <span>{{el.skuName}}</span>
                                     <Tag size="large" color="geekblue">{{el.skuDesc}}</Tag>
@@ -588,6 +596,10 @@
                                     <span>数量</span>
                                     <i-input v-model='el.skuCount' size="small" type="number" placeholder="0"/>
                                 </div>
+                                <div class="prev-code">
+                                    <span>商品编码</span>
+                                    <i-input v-model='el.skuCode' size="small" placeholder="0"/>
+                                </div>
                                 <i-button class="prev-del" type="warning" @click="del(i)">删除</i-button>
                             </li>
                         </transition-group>

platform-admin/src/main/webapp/js/common.js

@@ -458,7 +458,6 @@ Dict = function () {
  * @returns {string}
  */
 imageFormat = function (cellvalue, options, rowObject) {
-    console.log(55555, cellvalue)
     if (!cellvalue) {
 
         cellvalue = "<i class=\"fa fa-file-picture-o\" style=\"font-size:30px;\" title='无图'></i>";

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

@@ -50,7 +50,7 @@ let vm = new Vue({
             status: '',
             supplier: '',
             itemCategory: '',
-            creator:''
+            creator: ''
         },
 
 
@@ -124,6 +124,7 @@ let vm = new Vue({
             vm.title = "新增";
             vm.tbCfStationItem = {};
             this.uploadList.length = 0;
+            this.uploadList1.length = 0;
             // vm.tbCfStationItem.itemImg = "";
             UE.getEditor('itemDesc').setContent("");
         },
@@ -232,7 +233,9 @@ let vm = new Vue({
                                 skuName: item.skuName,
                                 skuDesc: item.skuDesc,
                                 skuPrice: item.skuPrice,
-                                skuCount: item.skuCount
+                                skuCount: item.skuCount,
+                                skuImg:item.skuImg,
+                                skuCode:item.skuCode
                             })
                         })
                         console.log(r)
@@ -319,7 +322,7 @@ let vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         },
-        /*
+
         tirggerFile : function (event) {
             var file = event.target.files[0]; // (利用console.log输出看file文件对象)
             var formData = new FormData();
@@ -335,15 +338,16 @@ let vm = new Vue({
                     result = JSON.parse(result);
                     console.log(result)
                     if (result.errno == 0) {//成功
-                        vm.tbCfStationItem.itemImg = result.data;
-                        console.log(vm.tbCfStationItem.itemImg)
+                        console.log(123,result)
+                        vm.tbCfStationItem.item.skuImg = result.data;
+                        console.log(vm.tbCfStationItem.item.skuImg)
                         vm.$forceUpdate();
                     } else {
                         iview.Message.error(result.errmsg);
                     }
                 }
             });
-        }*/
+        },
 
         /** ******************************************************************************************** */
         handleSuccess(response, file, fileList) {
@@ -351,6 +355,11 @@ let vm = new Vue({
             vm.uploadList.push(response);
             $("#itemImg").show();
         },
+        handleSuccess(response, file, fileList) {
+            // "http://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/education/155728894307110106.jpg"
+            vm.uploadList1.push(response);
+            $("#skuImg").show();
+        },
         handleBeforeUpload(file) {
             // 上传图片大小不超过5M
             if (file.size > 5 * 1024 * 1024) {