Merge branch 'master' of lsp/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1202,7 +1202,7 @@ public class GoodsServiceImpl implements GoodsService {
 
 
         // 获取未优惠前的商品价格
-        retailPrice = goods.getRetailPrice();;
+        retailPrice = goods.getRetailPrice();
 
 
         // 根据条码查询商品品牌名称 mall_brand  mall_product_store_rela  mall_goods

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesFullGiftServiceImpl.java

@@ -1,14 +1,13 @@
 package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.kmall.admin.dao.GoodsDao;
 import com.kmall.admin.dto.FreeGoodsDto;
 import com.kmall.admin.dto.FullReductionDto;
+import com.kmall.admin.entity.GoodsEntity;
 import com.kmall.admin.entity.MkActivitiesCouponEntity;
 import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
-import com.kmall.common.utils.MapBeanUtil;
-import com.kmall.common.utils.R;
-import com.kmall.common.utils.RRException;
-import com.kmall.common.utils.ValidatorUtil;
+import com.kmall.common.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Service("mkActivitiesFullGiftService")
 public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftService {
     @Autowired
+    private GoodsDao goodsDao;
+    @Autowired
     private MkActivitiesFullGiftDao mkActivitiesFullGiftDao;
 
     @Override
@@ -52,6 +53,11 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
 
     @Override
     public int save(MkActivitiesFullGiftEntity mkActivitiesFullGift) {
+        GoodsEntity goodsEntity = goodsDao.queryBySku(mkActivitiesFullGift.getGoodsSn());
+        if(!StringUtils.isNullOrEmpty(goodsEntity)){
+            mkActivitiesFullGift.setProductName(goodsEntity.getName()); //产品中文名
+        }
+
         return mkActivitiesFullGiftDao.save(mkActivitiesFullGift);
     }
 
@@ -82,8 +88,6 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
     public void uploadExcel(List<FreeGoodsDto> freeGoodsDtoList, String storeId, String mkaId) {
 
         // TODO 查询所有的品牌
-
-
         if (freeGoodsDtoList != null && freeGoodsDtoList.size() > 0) {
             for (int i = 0; i < freeGoodsDtoList.size(); i++) {
                 FreeGoodsDto freeGoodsDto = freeGoodsDtoList.get(i);
@@ -91,10 +95,10 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
                 // 校验excel传入的数据
                 ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
                 builder.put("storeId", "门店编号");
+                builder.put("fullReductionPrice", "满赠达到金额");
+                builder.put("brand", "商品品牌");
                 builder.put("goodsSn", "商品编码");
                 builder.put("barCode", "商品条码");
-                builder.put("brand", "商品品牌");
-                builder.put("fullReductionPrice", "满赠达到金额");
                 builder.put("sendGoodsSn", "赠送商品编号");
                 builder.put("sendBarCode", "赠送商品条码");
                 builder.put("deadline", "截止日期");
@@ -123,6 +127,10 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
                 mkActivitiesFullGiftEntity.setShopSn(storeId); // 门店编号
                 mkActivitiesFullGiftEntity.setMkaId(Long.parseLong(mkaId)); // 商品截止日期
 
+                GoodsEntity goodsEntity = goodsDao.queryBySku(freeGoodsDto.getGoodsSn());
+                if(!StringUtils.isNullOrEmpty(goodsEntity)){
+                    mkActivitiesFullGiftEntity.setProductName(goodsEntity.getName()); //产品中文名
+                }
 
                 mkActivitiesFullGiftDao.save(mkActivitiesFullGiftEntity);
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesGetOneFreeGoodsServiceImpl.java

@@ -1,13 +1,12 @@
 package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.kmall.admin.dao.GoodsDao;
 import com.kmall.admin.dto.BuyOneGetOneFreeDto;
 import com.kmall.admin.dto.FreeGoodsDto;
+import com.kmall.admin.entity.GoodsEntity;
 import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
-import com.kmall.common.utils.MapBeanUtil;
-import com.kmall.common.utils.R;
-import com.kmall.common.utils.RRException;
-import com.kmall.common.utils.ValidatorUtil;
+import com.kmall.common.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +30,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Service("mkActivitiesGetOneFreeGoodsService")
 public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOneFreeGoodsService {
     @Autowired
+    private GoodsDao goodsDao;
+    @Autowired
     private MkActivitiesGetOneFreeGoodsDao mkActivitiesGetOneFreeGoodsDao;
 
     @Override
@@ -50,6 +51,10 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
 
     @Override
     public int save(MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
+        GoodsEntity goodsEntity = goodsDao.queryBySku(mkActivitiesGetOneFreeGoods.getGoodsSn());
+        if(!StringUtils.isNullOrEmpty(goodsEntity)){
+            mkActivitiesGetOneFreeGoods.setProductName(goodsEntity.getName());
+        }
         return mkActivitiesGetOneFreeGoodsDao.save(mkActivitiesGetOneFreeGoods);
     }
 
@@ -80,8 +85,6 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
     public void uploadExcel(List<BuyOneGetOneFreeDto> buyOneGetOneFreeDtoList, String storeId, String mkaId) {
 
         // TODO 查询所有的品牌
-
-
         if (buyOneGetOneFreeDtoList != null && buyOneGetOneFreeDtoList.size() > 0) {
             for (int i = 0; i < buyOneGetOneFreeDtoList.size(); i++) {
                 BuyOneGetOneFreeDto buyOneGetOneFreeDto = buyOneGetOneFreeDtoList.get(i);
@@ -91,7 +94,8 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                 builder.put("storeId", "门店编号");
                 builder.put("buyGoodsSn", "商品编码");
                 builder.put("buyBarCode", "商品条码");
-                builder.put("buyBrand", "商品品牌");
+                builder.put("buyNum", "购买数量");
+//                builder.put("buyBrand", "商品品牌");
                 builder.put("sendBarCode", "赠送商品条码");
 
                 R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
@@ -103,6 +107,7 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                 if(old != null){
                     throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+buyOneGetOneFreeDto.getBuyBarCode()+"},品牌,{"+buyOneGetOneFreeDto.getBuyBrand()+"}",500);
                 }
+
                 // 保存日常活动商品
                 MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoodsEntity = new MkActivitiesGetOneFreeGoodsEntity();
                 mkActivitiesGetOneFreeGoodsEntity.setGoodsSn(buyOneGetOneFreeDto.getBuyGoodsSn()); // 商品编号
@@ -113,13 +118,14 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                 mkActivitiesGetOneFreeGoodsEntity.setShopSn(storeId); // 门店编号
                 mkActivitiesGetOneFreeGoodsEntity.setMkaId(Long.parseLong(mkaId));
 
+                GoodsEntity goodsEntity = goodsDao.queryBySku(buyOneGetOneFreeDto.getBuyBarCode());
+                if(!StringUtils.isNullOrEmpty(goodsEntity)){
+                    mkActivitiesGetOneFreeGoodsEntity.setProductName(goodsEntity.getName()); //产品中文名
+                }
 
                 mkActivitiesGetOneFreeGoodsDao.save(mkActivitiesGetOneFreeGoodsEntity);
-
-
             }
         }
-
     }
 
     /**

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html

@@ -40,9 +40,9 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivitiesFullGift" :rules="ruleValidate" :label-width="80">
-            <Form-item label="产品中文名" prop="productName">
+            <!--<Form-item label="产品中文名" prop="productName">
                 <i-input v-model="mkActivitiesFullGift.productName" placeholder="产品中文名"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item label="商品编码" prop="goodsSn">
                 <i-input v-model="mkActivitiesFullGift.goodsSn" placeholder="商品编码"/>
             </Form-item>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html

@@ -41,27 +41,27 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivitiesGetOneFreeGoods" :rules="ruleValidate" :label-width="80">
-            <Form-item label="产品中文名" prop="productName">
+            <!--<Form-item label="产品中文名" prop="productName">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.productName" placeholder="产品中文名"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item label="商品编码" prop="goodsSn">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.goodsSn" placeholder="商品编码"/>
             </Form-item>
-            <Form-item label="购买数量" prop="buyNum">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.buyNum" placeholder="购买数量"/>
-            </Form-item>
             <Form-item label="条形码" prop="barcode">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.barcode" placeholder="条形码"/>
             </Form-item>
+            <Form-item label="购买数量" prop="buyNum">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.buyNum" placeholder="购买数量"/>
+            </Form-item>
             <Form-item label="商品品牌" prop="productBrand">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.productBrand" placeholder="商品品牌"/>
             </Form-item>
             <Form-item label="赠品条码" prop="giftBarcode">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.giftBarcode" placeholder="赠品条码"/>
             </Form-item>
-            <Form-item label="赠送数量" prop="sendNum">
+            <!--<Form-item label="赠送数量" prop="sendNum">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.sendNum" placeholder="赠送数量"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

kmall-admin/src/main/webapp/js/mk/mkactivitiesgetonefreegoods.js

@@ -28,8 +28,8 @@ $(function () {
 			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 			{label: '购买数量', name: 'buyNum', index: 'buyNum', width: 80, align: 'center'},
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
-			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80, align: 'center'},
-			{label: '赠送数量', name: 'sendNum', index: 'sendNum', width: 80, align: 'center'}],
+			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80, align: 'center'}/*,
+			{label: '赠送数量', name: 'sendNum', index: 'sendNum', width: 80, align: 'center'}*/],
 		viewrecords: true,
 		postData: {'mkaId': vm.mkaId},
         height: 550,
@@ -64,8 +64,17 @@ let vm = new Vue({
         title: null,
 		mkActivitiesGetOneFreeGoods: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
+			goodsSn: [
+				{required: true, message: '商品编码不能为空', trigger: 'blur'}
+			],
+			barcode: [
+				{required: true, message: '条形码不能为空', trigger: 'blur'}
+			],
+			buyNum: [
+				{required: true, message: '购买数量不能为空', trigger: 'blur'}
+			],
+			giftBarcode: [
+				{required: true, message: '赠送条码不能为空', trigger: 'blur'}
 			]
 		},
 		q: {