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

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

@@ -1,13 +1,16 @@
 package com.kmall.admin.controller;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.kmall.admin.entity.SysCusUnitCodeEntity;
 import com.kmall.admin.service.SysCusUnitCodeService;
+import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -63,6 +66,13 @@ public class SysCusUnitCodeController {
     @RequiresPermissions("syscusunitcode:save")
     @ResponseBody
     public R save(@RequestBody SysCusUnitCodeEntity sysCusUnitCode) {
+
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        sysCusUnitCode.setCreaterSn(user.getUserId().toString());
+        sysCusUnitCode.setCreateTime(new Date());
+        sysCusUnitCode.setModerSn(user.getUserId().toString());
+        sysCusUnitCode.setModTime(new Date());
+
         sysCusUnitCodeService.save(sysCusUnitCode);
 
         return R.ok();
@@ -75,6 +85,11 @@ public class SysCusUnitCodeController {
     @RequiresPermissions("syscusunitcode:update")
     @ResponseBody
     public R update(@RequestBody SysCusUnitCodeEntity sysCusUnitCode) {
+
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        sysCusUnitCode.setModerSn(user.getUserId().toString());
+        sysCusUnitCode.setModTime(new Date());
+
         sysCusUnitCodeService.update(sysCusUnitCode);
 
         return R.ok();

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusNationCodeDao.java

@@ -14,5 +14,8 @@ import java.util.List;
  * @date 2018-11-10 15:26:44
  */
 public interface SysCusNationCodeDao extends BaseDao<SysCusNationCodeEntity> {
+
     SysCusNationCodeEntity queryObjectByName(@Param("nationName")String nationName);
+
+    SysCusNationCodeEntity queryObjectByCode(@Param("code")String code);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusUnitCodeDao.java

@@ -14,5 +14,8 @@ import java.util.List;
  * @date 2018-11-10 15:34:36
  */
 public interface SysCusUnitCodeDao extends BaseDao<SysCusUnitCodeEntity> {
+
     SysCusUnitCodeEntity queryObjectByName(@Param("unitName")String unitName);
+
+    SysCusUnitCodeEntity queryObjectByCode(@Param("code")String code);
 }

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

@@ -54,6 +54,11 @@ public class SysCusNationCodeServiceImpl
             throw new RRException("代码长度有误");
         }
 
+        SysCusNationCodeTemp = sysCusNationCodeDao.queryObjectByCode(sysCusNationCode.getCode());
+        if (SysCusNationCodeTemp != null) {
+            throw new RRException("代码已经存在");
+        }
+
         if (StringUtils.isNotEmpty(sysCusNationCode.getDiscountsTaxType()) &&
             sysCusNationCode.getDiscountsTaxType().length() > 1) {
             throw new RRException("优普税率类型有误");
@@ -67,13 +72,18 @@ public class SysCusNationCodeServiceImpl
     public int update(SysCusNationCodeEntity sysCusNationCode) {
         SysCusNationCodeEntity SysCusNationCodeTemp = sysCusNationCodeDao.queryObjectByName(sysCusNationCode.getName());
         if (SysCusNationCodeTemp != null && !SysCusNationCodeTemp.getSn().equals(sysCusNationCode.getSn())) {
-            throw new RRException("名称编号已经存在");
+            throw new RRException("名称已经存在");
         }
 
         if (sysCusNationCode.getCode().length() > 3) {
             throw new RRException("代码长度有误");
         }
 
+        SysCusNationCodeTemp = sysCusNationCodeDao.queryObjectByCode(sysCusNationCode.getCode());
+        if (SysCusNationCodeTemp != null && !SysCusNationCodeTemp.getSn().equals(sysCusNationCode.getSn())) {
+            throw new RRException("代码已经存在");
+        }
+
         if (StringUtils.isNotEmpty(sysCusNationCode.getDiscountsTaxType()) &&
             sysCusNationCode.getDiscountsTaxType().length() > 1) {
             throw new RRException("优普税率类型有误");

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

@@ -1,8 +1,13 @@
 package com.kmall.admin.service.impl;
 
 import com.kmall.admin.dao.SysCusUnitCodeDao;
+import com.kmall.admin.entity.SysCusNationCodeEntity;
 import com.kmall.admin.entity.SysCusUnitCodeEntity;
 import com.kmall.admin.service.SysCusUnitCodeService;
+import com.kmall.common.constant.TablePrimaryKeyPrefix;
+import com.kmall.common.utils.RRException;
+import com.kmall.common.utils.RandomUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +22,8 @@ import java.util.Map;
  * @date 2018-11-10 15:34:36
  */
 @Service("sysCusUnitCodeService")
-public class SysCusUnitCodeServiceImpl implements SysCusUnitCodeService {
+public class SysCusUnitCodeServiceImpl
+        implements SysCusUnitCodeService {
     @Autowired
     private SysCusUnitCodeDao sysCusUnitCodeDao;
 
@@ -38,11 +44,42 @@ public class SysCusUnitCodeServiceImpl implements SysCusUnitCodeService {
 
     @Override
     public int save(SysCusUnitCodeEntity sysCusUnitCode) {
+
+        SysCusUnitCodeEntity SysCusUnitCodeTemp = sysCusUnitCodeDao.queryObjectByName(sysCusUnitCode.getName());
+        if (SysCusUnitCodeTemp != null) {
+            throw new RRException("名称已经存在");
+        }
+
+        if (sysCusUnitCode.getCode().length() > 3) {
+            throw new RRException("代码长度有误");
+        }
+
+        SysCusUnitCodeTemp = sysCusUnitCodeDao.queryObjectByCode(sysCusUnitCode.getCode());
+        if (SysCusUnitCodeTemp != null) {
+            throw new RRException("代码已经存在");
+        }
+
+        sysCusUnitCode.setSn(TablePrimaryKeyPrefix.sys_cus_unit_code + RandomUtils.getNum(18));
+
         return sysCusUnitCodeDao.save(sysCusUnitCode);
     }
 
     @Override
     public int update(SysCusUnitCodeEntity sysCusUnitCode) {
+        SysCusUnitCodeEntity SysCusUnitCodeTemp = sysCusUnitCodeDao.queryObjectByName(sysCusUnitCode.getName());
+        if (SysCusUnitCodeTemp != null && !SysCusUnitCodeTemp.getSn().equals(sysCusUnitCode.getSn())) {
+            throw new RRException("名称已经存在");
+        }
+
+        if (sysCusUnitCode.getCode().length() > 3) {
+            throw new RRException("代码长度有误");
+        }
+
+        SysCusUnitCodeTemp = sysCusUnitCodeDao.queryObjectByCode(sysCusUnitCode.getCode());
+        if (SysCusUnitCodeTemp != null && !SysCusUnitCodeTemp.getSn().equals(sysCusUnitCode.getSn())) {
+            throw new RRException("代码已经存在");
+        }
+
         return sysCusUnitCodeDao.update(sysCusUnitCode);
     }
 
@@ -52,7 +89,7 @@ public class SysCusUnitCodeServiceImpl implements SysCusUnitCodeService {
     }
 
     @Override
-    public int deleteBatch(String[]sns) {
+    public int deleteBatch(String[] sns) {
         return sysCusUnitCodeDao.deleteBatch(sns);
     }
 }

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

@@ -54,6 +54,24 @@
 		where `name` = #{nationName}
 	</select>
 
+	<select id="queryObjectByCode" resultType="com.kmall.admin.entity.SysCusNationCodeEntity">
+		select
+		`sn`,
+		`code`,
+		`name`,
+		`ename`,
+		`discounts_tax_type`,
+		`remark`,
+		`is_valid`,
+		`creater_sn`,
+		`create_time`,
+		`moder_sn`,
+		`mod_time`,
+		`tstm`
+		from sys_cus_nation_code
+		where `code` = #{code}
+	</select>
+
 	<select id="queryList" resultType="com.kmall.admin.entity.SysCusNationCodeEntity">
 		select
     		`sn`,

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

@@ -47,6 +47,22 @@
 		from sys_cus_unit_code
 		where `name` = #{unitName}
 	</select>
+
+	<select id="queryObjectByCode" resultType="com.kmall.admin.entity.SysCusUnitCodeEntity">
+		select
+		`sn`,
+		`code`,
+		`name`,
+		`remark`,
+		`is_valid`,
+		`creater_sn`,
+		`create_time`,
+		`moder_sn`,
+		`mod_time`,
+		`tstm`
+		from sys_cus_unit_code
+		where `code` = #{code}
+	</select>
 	<select id="queryList" resultType="com.kmall.admin.entity.SysCusUnitCodeEntity">
 		select
     		`sn`,

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

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>计量单位代码</title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("syscusunitcode:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("syscusunitcode:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("syscusunitcode:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="sysCusUnitCode" :rules="ruleValidate" :label-width="80">
+            <Form-item label="代码" prop="code">
+                <i-input v-model="sysCusUnitCode.code" placeholder="代码"/>
+            </Form-item>
+            <Form-item label="名称" prop="name">
+                <i-input v-model="sysCusUnitCode.name" placeholder="名称"/>
+            </Form-item>
+            <Form-item label="是否有效" prop="isValid">
+                <Radio-group v-model="sysCusUnitCode.isValid">
+                    <Radio label="1">
+                        <span>无效</span>
+                    </Radio>
+                    <Radio label="0">
+                        <span>有效</span>
+                    </Radio>
+                </Radio-group>
+            </Form-item>
+            <Form-item label="备注" prop="remark">
+                <i-input v-model="sysCusUnitCode.remark" placeholder="备注"/>
+            </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>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/shop/syscusunitcode.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -0,0 +1,159 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../syscusunitcode/list',
+        datatype: "json",
+        colModel: [
+			{label: 'sn', name: 'sn', index: 'sn', key: true, hidden: true},
+			{label: '代码', name: 'code', index: 'code', width: 80},
+			{label: '名称', name: 'name', index: 'name', width: 80},
+            {
+                label: '是否有效',
+                name: 'isValid',
+                align: 'center',
+                index: 'is_valid',
+                width: '50px',
+                formatter: function (value) {
+                    if(value == 0){
+                        value = 1;
+                    }else if(value == 1){
+                        value = 0;
+                    }
+                    return transIsNot(value);
+                }
+            },
+            {label: '备注', name: 'remark', index: 'remark', width: 80}],
+		viewrecords: true,
+        height: 385,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+        sysCusUnitCode: {code:'',name:'',isValid:'',remark:''},
+		ruleValidate: {
+            code: [
+                {required: true, message: '代码不能为空', trigger: 'blur'}
+            ],
+            name: [
+                {required: true, message: '名称不能为空', trigger: 'blur'}
+            ]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.sysCusUnitCode = {};
+		},
+		update: function (event) {
+            let sn = getSelectedRow();
+			if (sn == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(sn)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.sysCusUnitCode.sn == null ? "../syscusunitcode/save" : "../syscusunitcode/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.sysCusUnitCode),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let sns = getSelectedRows();
+			if (sns == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../syscusunitcode/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(sns),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(sn){
+			$.get("../syscusunitcode/info/"+sn, function (r) {
+                vm.sysCusUnitCode = r.sysCusUnitCode;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

kmall-common/src/main/java/com/kmall/common/constant/TablePrimaryKeyPrefix.java

@@ -10,4 +10,6 @@ package com.kmall.common.constant;
 public class TablePrimaryKeyPrefix {
     //国别地区代码
     public static final String sys_cus_nation_code = "scnc";
+    //计量单位代码
+    public static final String sys_cus_unit_code = "scuc";
 }