修复页面bug

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivityFormController.java

@@ -9,7 +9,10 @@ import com.kmall.admin.service.mk.MkActivityFormService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.RRException;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
@@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.*;
 @Controller
 @RequestMapping("mkactivityform")
 public class MkActivityFormController {
+    private static final Logger logger = LoggerFactory.getLogger(MkActivityFormController.class);
+
     @Autowired
     private MkActivityFormService mkActivityFormService;
 
@@ -69,7 +74,12 @@ public class MkActivityFormController {
     @RequiresPermissions("mkactivityform:save")
     @ResponseBody
     public R save(@RequestBody MkActivityFormEntity mkActivityForm) {
-        mkActivityFormService.save(mkActivityForm);
+        try {
+            mkActivityFormService.save(mkActivityForm);
+        } catch (RRException e) {
+            logger.error(e.getMsg());
+            return R.error(e.getMsg());
+        }
 
         return R.ok();
     }
@@ -81,7 +91,12 @@ public class MkActivityFormController {
     @RequiresPermissions("mkactivityform:update")
     @ResponseBody
     public R update(@RequestBody MkActivityFormEntity mkActivityForm) {
-        mkActivityFormService.update(mkActivityForm);
+        try {
+            mkActivityFormService.update(mkActivityForm);
+        } catch (RRException e) {
+            logger.error(e.getMsg());
+            return R.error(e.getMsg());
+        }
 
         return R.ok();
     }

kmall-admin/src/main/java/com/kmall/admin/dao/mk/MkActivityFormDao.java

@@ -3,6 +3,7 @@ package com.kmall.admin.dao.mk;
 import com.kmall.admin.entity.mk.MkActivitiesEntity;
 import com.kmall.admin.entity.mk.MkActivityFormEntity;
 import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +21,12 @@ public interface MkActivityFormDao extends BaseDao<MkActivityFormEntity> {
 
     List<MkActivitiesEntity> queryMkactivitiesList(Map<String, Object> map);
 
+    /**
+     * 根据活动代码查询
+     *
+     * @param mkCode 活动代码
+     * @return
+     */
+    MkActivityFormEntity queryObjectByMkCode(@Param("mkCode") String mkCode);
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivityFormServiceImpl.java

@@ -6,6 +6,7 @@ import com.kmall.admin.entity.mk.MkActivityFormEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.mk.MkActivityFormService;
 import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.common.utils.RRException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +45,11 @@ public class MkActivityFormServiceImpl implements MkActivityFormService {
     public int save(MkActivityFormEntity mkActivityForm) {
         SysUserEntity user = ShiroUtils.getUserEntity();
 
+        MkActivityFormEntity isExistEntity = mkActivityFormDao.queryObjectByMkCode(mkActivityForm.getMkCode());
+        if (isExistEntity != null) {
+            throw new RRException("活动代码已存在！");
+        }
+
         mkActivityForm.setCreaterSn(user.getUserId().toString());
         mkActivityForm.setCreateTime(new Date());
         return mkActivityFormDao.save(mkActivityForm);
@@ -51,6 +57,11 @@ public class MkActivityFormServiceImpl implements MkActivityFormService {
 
     @Override
     public int update(MkActivityFormEntity mkActivityForm) {
+        MkActivityFormEntity isExistEntity = mkActivityFormDao.queryObjectByMkCode(mkActivityForm.getMkCode());
+        if (isExistEntity != null && !isExistEntity.getMmId().equals(mkActivityForm.getMmId())) {
+            throw new RRException("活动代码已存在！");
+        }
+
         return mkActivityFormDao.update(mkActivityForm);
     }
 

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

@@ -62,6 +62,9 @@
 		<if test="machineCode != null and machineCode.trim() != ''">
 			AND cashier.machine_code LIKE concat('%',#{machineCode},'%')
 		</if>
+		<if test="storeName != null and storeName.trim() != ''">
+			AND store.store_name LIKE concat('%',#{storeName},'%')
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -76,10 +79,14 @@
 	</select>
 
  	<select id="queryTotal" resultType="int">
-		select count(*) from mall2_cashier
+		select count(*) from mall2_cashier cashier
+		left join mall_store store on cashier.shop_sn = store.id
 		WHERE 1=1
 		<if test="machineCode != null and machineCode.trim() != ''">
-			AND machine_code LIKE concat('%',#{machineCode},'%')
+			AND cashier.machine_code LIKE concat('%',#{machineCode},'%')
+		</if>
+		<if test="storeName != null and storeName.trim() != ''">
+			AND store.store_name LIKE concat('%',#{storeName},'%')
 		</if>
 	</select>
 

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

@@ -90,6 +90,9 @@
         <if test="goodsSpecificationIds != null and goodsSpecificationIds != ''">
             AND mall_product.goods_specification_ids = #{goodsSpecificationIds}
         </if>
+        <if test="goodsSn != null and goodsSn.trim() != ''">
+            AND mall_goods.goods_sn LIKE concat('%',#{goodsSn},'%')
+        </if>
     </select>
 
     <insert id="save" parameterType="com.kmall.admin.entity.ProductEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesDao.xml

@@ -131,7 +131,7 @@
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="updateTime != null">`update_time` = #{updateTime}, </if>
-			<if test="moderSn != null">`moder_sn` = #{moderSn}</if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn},</if>
 			<if test="priority != null">`priority` = #{priority}</if>
 		</set>
 		where mka_id = #{mkaId}

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -153,5 +153,16 @@
 		</if>
 	</select>
 
+	<select id="queryObjectByMkCode" resultType="com.kmall.admin.entity.mk.MkActivityFormEntity">
+		select
+			`mm_id`,
+			`mk_name`,
+			`mk_code`,
+			`create_time`,
+			`creater_sn`
+		from mk_activity_form
+		where mk_code = #{mkCode}
+	</select>
+
 
 </mapper>

kmall-admin/src/main/webapp/WEB-INF/page/cashier/cashierManager.html

@@ -12,6 +12,9 @@
                 <i-col span="4">
                     <i-input v-model="q.machineCode" @on-enter="query" placeholder="机器码"/>
                 </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>
+                </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>

kmall-admin/src/main/webapp/js/cashier/cashierManager.js

@@ -84,7 +84,8 @@ let vm = new Vue({
             // ]
 		},
 		q: {
-            machineCode: ''
+            machineCode: '',
+            storeName: ''
 		}
 	},
 	methods: {
@@ -112,7 +113,7 @@ let vm = new Vue({
 		},
 		saveOrUpdate: function (event) {
             let url = vm.cashier.mcId == null ? "../cashier/save" : "../cashier/update";
-            console.log(vm.cashier);
+
 			$.ajax({
 				type: "POST",
 			    url: url,
@@ -156,11 +157,13 @@ let vm = new Vue({
 		getInfo: function(mcId){
 			$.get("../cashier/info/"+mcId, function (r) {
                 vm.cashier = r.cashier;
+                vm.cashier.shopSn = r.cashier.shopSn * 1;
             });
 		},
         reloadSearch: function() {
             vm.q = {
-                machineCode: ''
+                machineCode: '',
+                storeName: ''
             }
             vm.reload();
 		},
@@ -171,7 +174,7 @@ let vm = new Vue({
                 page = $("#jqGrid").jqGrid('getGridParam', 'page');
             }
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'machineCode': vm.q.machineCode},
+                postData: {'machineCode': vm.q.machineCode, 'storeName': vm.q.storeName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/cashier/salerecord.js

@@ -16,7 +16,7 @@ $(function () {
 				}
 				return value;
 				}},
-			{label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 120,},
+			// {label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 120,},
 			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 160,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}

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

@@ -163,10 +163,12 @@ let vm = new Vue({
         mkActivityForm: {},
         ruleValidate: {
             mkCode: [
-                {required: true, message: '活动形式代码不能为空', trigger: 'blur'}
+                {required: true, message: '活动形式代码不能为空', trigger: 'blur'},
+                {max: 32, message: '活动形式代码长度不能超过32', trigger: 'blur'}
             ],
             mkName: [
-                {required: true, message: '活动形式名称不能为空', trigger: 'blur'}
+                {required: true, message: '活动形式名称不能为空', trigger: 'blur'},
+                {max: 32, message: '活动形式名称长度不能超过32', trigger: 'blur'}
             ]
         },
         q: {