Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/UserController.java

@@ -123,18 +123,19 @@ public class UserController {
 
         ExcelExport ee = new ExcelExport("会员列表");
 
-        String[] header = new String[]{"会员微信名称", "会员名称", "性别", "会员级别", "手机号码"};
+        String[] header = new String[]{"会员微信名称", "会员名称", "性别", "会员级别", "手机号码", "身份证"};
 
         List<Map<String, Object>> list = new ArrayList<>();
 
         if (userList != null && userList.size() != 0) {
             for (UserEntity userEntity : userList) {
                 LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-                map.put("NICKNAME", userEntity.getUsername());
+                map.put("NICKNAME", userEntity.getNickname());
                 map.put("USERNAME", userEntity.getUsername());
                 map.put("GENDER", userEntity.getGender() == 1 ? "男" : (userEntity.getGender() == 2 ? "女" : "未知"));
                 map.put("LEVEL_NAME", userEntity.getLevelName());
                 map.put("MOBILE", userEntity.getMobile());
+                map.put("IDNO", userEntity.getIdNo());
                 list.add(map);
             }
         }

kmall-admin/src/main/java/com/kmall/admin/entity/UserEntity.java

@@ -49,6 +49,8 @@ public class UserEntity implements Serializable {
     //会员级别
     private String levelName;
 
+    private String idNo;
+
     /**
      * 设置：主键
      */
@@ -105,6 +107,14 @@ public class UserEntity implements Serializable {
         return gender;
     }
 
+    public String getIdNo() {
+        return idNo;
+    }
+
+    public void setIdNo(String idNo) {
+        this.idNo = idNo;
+    }
+
     /**
      * 设置：出生日期
      */

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

@@ -97,21 +97,27 @@ public class GoodsServiceImpl implements GoodsService {
         builder.put("retailPrice", "零售价格");
         builder.put("isHot", "热销");
 
-        if (!Dict.orderBizType.item_11.getItem().equals(goods.getGoodsBizType())) {
-            // 海关信息，普通货物可不添加
-            builder.put("sku", "SKU");
-            builder.put("prodBarcode", "产品编码");
-            builder.put("brand", "产品品牌");
-            builder.put("unitCode", "计量单位代码");
-            builder.put("cusGoodsCode", "海关商品编码");
-            builder.put("ciqProdModel", "国检规格型号");
-            builder.put("oriCntCode", "原产国代码");
-            builder.put("cusDeclEle", "海关申报要素");
-            builder.put("cusRecCode", "海关备案编号");
-        }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
+        } else {
+            if (!Dict.orderBizType.item_11.getItem().equals(goods.getGoodsBizType())) {
+                // 海关信息，普通货物可不添加
+                builder.put("sku", "SKU");
+                builder.put("retailPrice", "零售价");
+                builder.put("prodBarcode", "产品编码");
+                builder.put("brand", "产品品牌");
+                builder.put("unitCode", "计量单位代码");
+                builder.put("cusGoodsCode", "海关商品编码");
+                builder.put("ciqProdModel", "国检规格型号");
+                builder.put("oriCntCode", "原产国代码");
+                builder.put("cusDeclEle", "海关申报要素");
+                builder.put("cusRecCode", "海关备案编号");
+            }
+            r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+            if (Integer.valueOf(r.get("code").toString()) != 0) {
+                throw new RRException(r.get("msg").toString());
+            }
         }
 
         // 商品轮播图
@@ -132,6 +138,10 @@ public class GoodsServiceImpl implements GoodsService {
         }
 
         // 添加商品
+        if (Dict.orderBizType.item_02.getItem().equals(goods.getGoodsBizType())
+                || Dict.orderBizType.item_10.getItem().equals(goods.getGoodsBizType())) {
+            goods.setIsHot(0);
+        }
         goods.setAttributeCategory(categoryDao.queryObject(goods.getCategoryId()).getParentId());
         goods.setAddTime(new Date());
         goods.setIsDelete(0);
@@ -209,22 +219,28 @@ public class GoodsServiceImpl implements GoodsService {
         builder.put("goodsRate", "商品税率");
         builder.put("isHot", "热销");
 
-        if (!Dict.orderBizType.item_11.getItem().equals(goods.getGoodsBizType())) {
-            // 海关信息，普通货物可不添加
-            builder.put("sku", "SKU");
-            builder.put("retailPrice", "零售价");
-            builder.put("prodBarcode", "产品编码");
-            builder.put("brand", "产品品牌");
-            builder.put("unitCode", "计量单位代码");
-            builder.put("cusGoodsCode", "海关商品编码");
-            builder.put("ciqProdModel", "国检规格型号");
-            builder.put("oriCntCode", "原产国代码");
-            builder.put("cusDeclEle", "海关申报要素");
-            builder.put("cusRecCode", "海关备案编号");
-        }
+
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
+        } else {
+            if (!Dict.orderBizType.item_11.getItem().equals(goods.getGoodsBizType())) {
+                // 海关信息，普通货物可不添加
+                builder.put("sku", "SKU");
+                builder.put("retailPrice", "零售价");
+                builder.put("prodBarcode", "产品编码");
+                builder.put("brand", "产品品牌");
+                builder.put("unitCode", "计量单位代码");
+                builder.put("cusGoodsCode", "海关商品编码");
+                builder.put("ciqProdModel", "国检规格型号");
+                builder.put("oriCntCode", "原产国代码");
+                builder.put("cusDeclEle", "海关申报要素");
+                builder.put("cusRecCode", "海关备案编号");
+            }
+            r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+            if (Integer.valueOf(r.get("code").toString()) != 0) {
+                throw new RRException(r.get("msg").toString());
+            }
         }
 
         // 商品轮播图
@@ -246,6 +262,10 @@ public class GoodsServiceImpl implements GoodsService {
         }
 
         // 修改商品
+        if (Dict.orderBizType.item_02.getItem().equals(goods.getGoodsBizType())
+                || Dict.orderBizType.item_10.getItem().equals(goods.getGoodsBizType())) {
+            goods.setIsHot(0);
+        }
         goods.setAttributeCategory(categoryDao.queryObject(goods.getCategoryId()).getParentId());
         goods.setIsDelete(0);
         goods.setIsNew(0);

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

@@ -61,22 +61,28 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 
     @Override
     public int save(ProductStoreRelaEntity productStoreRela) {
+        GoodsEntity goodsEntity = null;
         Map<String, Object> valideDate = MapBeanUtil.fromObject(productStoreRela);
         ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
         builder.put("storeId", "门店");
         builder.put("goodsId", "商品");
         builder.put("stockNum", "库存");
 
-        GoodsEntity goodsEntity = goodsDao.queryObject(productStoreRela.getGoodsId());
-        if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
-            // 普通商品校验商品规格
-            builder.put("specification", "规格");
-            builder.put("retailPrice", "零售价");
-            builder.put("marketPrice", "市场价");
-        }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
+        } else {
+            goodsEntity = goodsDao.queryObject(productStoreRela.getGoodsId());
+            if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
+                // 普通商品校验商品规格
+                builder.put("specification", "规格");
+                builder.put("retailPrice", "零售价");
+                builder.put("marketPrice", "市场价");
+            }
+            r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+            if (Integer.valueOf(r.get("code").toString()) != 0) {
+                throw new RRException(r.get("msg").toString());
+            }
         }
 
         Map<String, Object> map = new HashMap();
@@ -122,22 +128,28 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 
     @Override
     public int update(ProductStoreRelaEntity productStoreRela) {
+        GoodsEntity goodsEntity = null;
         Map<String, Object> valideDate = MapBeanUtil.fromObject(productStoreRela);
         ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
         builder.put("storeId", "门店");
         builder.put("goodsId", "商品");
         builder.put("stockNum", "库存");
 
-        GoodsEntity goodsEntity = goodsDao.queryObject(productStoreRela.getGoodsId());
-        if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
-            // 普通商品校验商品规格
-            builder.put("specification", "规格");
-            builder.put("retailPrice", "零售价");
-            builder.put("marketPrice", "市场价");
-        }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
+        } else {
+            goodsEntity = goodsDao.queryObject(productStoreRela.getGoodsId());
+            if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
+                // 普通商品校验商品规格
+                builder.put("specification", "规格");
+                builder.put("retailPrice", "零售价");
+                builder.put("marketPrice", "市场价");
+            }
+            r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+            if (Integer.valueOf(r.get("code").toString()) != 0) {
+                throw new RRException(r.get("msg").toString());
+            }
         }
 
         Map<String, Object> map = new HashMap();

kmall-admin/src/main/resources/mybatis/mapper/UserDao.xml

@@ -18,46 +18,21 @@
         <result property="registerIp" column="register_ip"/>
         <result property="avatar" column="avatar"/>
         <result property="weixinOpenid" column="weixin_openid"/>
+        <result property="id" column="id_no"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.UserEntity">
-		select
-			id,
-			username,
-			password,
-			gender,
-			birthday,
-			register_time,
-			last_login_time,
-			last_login_ip,
-			user_level_id,
-			nickname,
-			mobile,
-			register_ip,
-			avatar,
-			weixin_openid
+		select *
 		from mall_user
 		where id = #{id}
 	</select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.UserEntity">
         select
-        mall_user.id,
-        mall_user.username,
-        mall_user.password,
-        mall_user.gender,
-        mall_user.birthday,
-        mall_user.register_time,
-        mall_user.last_login_time,
-        mall_user.last_login_ip,
-        mall_user.user_level_id,
-        mall_user.nickname,
-        mall_user.mobile,
-        mall_user.register_ip,
-        mall_user.avatar,
-        mall_user.weixin_openid,
+        mall_user.*,
         mall_user_level.name levelName
-        from mall_user LEFT JOIN mall_user_level ON mall_user.user_level_id=mall_user_level.id
+        from mall_user
+        LEFT JOIN mall_user_level ON mall_user.user_level_id=mall_user_level.id
         WHERE 1=1
         <if test="username != null and username.trim() != ''">
             and username like concat('%',#{username},'%')

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -71,14 +71,14 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("productstorerela:upload"))
+                <!--#if($shiro.hasPermission("productstorerela:upload"))
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError"
                             action="../goods/upload">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                 </i-col>
-                #end
+                #end-->
                 #if($shiro.hasPermission("productstorerela:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end

kmall-admin/src/main/webapp/js/shop/order.js

@@ -377,7 +377,7 @@ let vm = new Vue({
                 data: params,
                 success: function (r) {
                     if (r.code === 0) {
-                        alert('取消成功', function (index) {
+                        alert('退款成功', function (index) {
                             vm.reload();
                         });
                     } else {

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -212,7 +212,7 @@ var vm = new Vue({
                 data: params,
                 success: function (r) {
                     if (r.code === 0) {
-                        alert('取消成功', function (index) {
+                        alert('退款成功', function (index) {
                             vm.reload();
                         });
                     } else {

kmall-common/src/main/java/com/kmall/common/utils/print/ticket/TicketPrintUtil.java

@@ -48,7 +48,7 @@ public class TicketPrintUtil {
         ticket.setTicketCommonFont(commonFont);
 
         // 打印
-        TicketPrinter.print2(ticket);
+        TicketPrinter.print(ticket);
         return ticket;
     }