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

kmall-admin/src/main/java/com/kmall/admin/annotation/NoRepeatSubmit.java

@@ -17,8 +17,8 @@ import java.lang.annotation.*;
 public @interface NoRepeatSubmit {
 
     /**
-     * 默认时间  默认5秒钟
+     * 默认时间  默认1秒钟
      * @return
      */
-    int lockTime() default 5000;
+    int lockTime() default 1000;
 }

kmall-admin/src/main/java/com/kmall/admin/aop/RepeatSubmitAspect.java

@@ -13,6 +13,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
 import java.util.Objects;
 
 /**
@@ -43,7 +44,8 @@ public class RepeatSubmitAspect {
 //            sb.append(KEYPREX).append(request.getHeader("token").toString()).append(request.getRequestURI().toString());
             sb.append(KEYPREX).append(request.getRequestURI().toString());
             //获取现在时间
-            long now = System.currentTimeMillis();
+//            long now = System.currentTimeMillis();
+            long now = Calendar.getInstance().getTimeInMillis();
             if (JedisUtil.exists(sb.toString())) {
                 //上次请求时间
 //                long lastTime = Long.valueOf(redisTemplate.opsForValue().get(sb.toString()).toString());

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

@@ -129,7 +129,7 @@ public class MallPaymentOrderDataController {
     @RequestMapping(value = "exportDataFormat")
     @RequiresPermissions("mallpaymentorderdata:exportDataFormat")
     @ResponseBody
-    public R exportSystemFormat(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) throws ParseException {
+    public R exportSystemFormat(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) throws Exception {
 
         params = ParamUtils.setTimeMap(params);
         mall2PaymentOrderDataService.exportDataFormatList(params,response);

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

@@ -242,45 +242,50 @@ public class MallPaymentOrderDataServiceImpl implements MallPaymentOrderDataServ
     }
     @Override
     public void exportDataFormatList(Map<String, Object> map, HttpServletResponse response) {
-        List<MallPaymentOrderDataEntity> mallList = mall2PaymentOrderDataDao.queryListData(map);
-        String payFlag = map.get("payFlag").toString();
-        String itemName = null;
-        String[] header = null;
-        LinkedHashMap<String, Object> headerMap = null;
-        if (Dict.payFlag.item_weixin.getItem().equals(payFlag)) {
-            //初始化 第一行数据信息
-            itemName = Dict.payFlag.item_weixin.getItemName();
-            header = new String[]{"Time Str","Transaction Order", "OutTrade No", "Pay Type", "Transaction Status", "Payment Type","Currency Type","Amount Order","Cash Coupon","Refund Id",
-                    "MerRefund Number", "Refund Money", "Refund RechargpCoupon", "Refund Type", "Refund Status", "Merchant Name","Attach", "Fee Charge", "Rate", "Pay Money",
-                    "ApplyRefund Amount","Rate Remark"};
-            //初始化 第二行数据信息
-            headerMap = initHeaderWxMap();
-        }else if (Dict.payFlag.item_alipay.getItem().equals(payFlag)){
-            //初始化 第一行数据信息
-            itemName = Dict.payFlag.item_alipay.getItemName();
-            header = new String[]{"Time Str","Transaction Order", "Serial Number", "OutTrade No", "Pay Type", "Pay Money","Refund Money","payment Type","Opposite Account","Other Name",
-                    "Bank Order ", "Merchant Name", "Remark", "BusinessBasic Order", "Business Order", "BusinessBilling Source","Business Description", "Payment Notes"};
-            //初始化 第二行数据信息
-            headerMap = initHeaderAliMap();
-        }
-        // excel 表单名字
-        ExcelExport ee = new ExcelExport(itemName+"账单");
-        List<Map<String, Object>> list = new LinkedList<>();
-        list.add(headerMap);
-        for (MallPaymentOrderDataEntity orderDataEntity : mallList) {
-            LinkedHashMap<String, Object> mapLinked = new LinkedHashMap<>(24);
+        try {
+            List<MallPaymentOrderDataEntity> mallList = mall2PaymentOrderDataDao.queryListData(map);
+            String payFlag = map.get("payFlag").toString();
+            String itemName = null;
+            String[] header = null;
+            LinkedHashMap<String, Object> headerMap = null;
             if (Dict.payFlag.item_weixin.getItem().equals(payFlag)) {
-                //渲染表单数据
-                mapLinked = initHeaderWxMap(orderDataEntity);
+                //初始化 第一行数据信息
+                itemName = Dict.payFlag.item_weixin.getItemName();
+                header = new String[]{"Time Str","Transaction Order", "OutTrade No", "Pay Type", "Transaction Status", "Payment Type","Currency Type","Amount Order","Cash Coupon","Refund Id",
+                        "MerRefund Number", "Refund Money", "Refund RechargpCoupon", "Refund Type", "Refund Status", "Merchant Name","Attach", "Fee Charge", "Rate", "Pay Money",
+                        "ApplyRefund Amount","Rate Remark"};
+                //初始化 第二行数据信息
+                headerMap = initHeaderWxMap();
             }else if (Dict.payFlag.item_alipay.getItem().equals(payFlag)){
-                //渲染表单数据
-                mapLinked = initHeaderAliMap(orderDataEntity);
+                //初始化 第一行数据信息
+                itemName = Dict.payFlag.item_alipay.getItemName();
+                header = new String[]{"Time Str","Transaction Order", "Serial Number", "OutTrade No", "Pay Type", "Pay Money","Refund Money","payment Type","Opposite Account","Other Name",
+                        "Bank Order ", "Merchant Name", "Remark", "BusinessBasic Order", "Business Order", "BusinessBilling Source","Business Description", "Payment Notes"};
+                //初始化 第二行数据信息
+                headerMap = initHeaderAliMap();
+            }
+            // excel 表单名字
+            ExcelExport ee = new ExcelExport(itemName+"账单");
+            List<Map<String, Object>> list = new LinkedList<>();
+            list.add(headerMap);
+            for (MallPaymentOrderDataEntity orderDataEntity : mallList) {
+                LinkedHashMap<String, Object> mapLinked = new LinkedHashMap<>(24);
+                if (Dict.payFlag.item_weixin.getItem().equals(payFlag)) {
+                    //渲染表单数据
+                    mapLinked = initHeaderWxMap(orderDataEntity);
+                }else if (Dict.payFlag.item_alipay.getItem().equals(payFlag)){
+                    //渲染表单数据
+                    mapLinked = initHeaderAliMap(orderDataEntity);
+                }
+                list.add(mapLinked);
             }
-            list.add(mapLinked);
+            //渲染excel表单
+            ee.addSheetByMap(itemName+"账单", list, header);
+            ee.export(response);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RRException(e.getMessage());
         }
-        //渲染excel表单
-        ee.addSheetByMap(itemName+"账单", list, header);
-        ee.export(response);
     }
 
     private LinkedHashMap<String, Object> initHeaderAliMap() {

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

@@ -218,9 +218,9 @@
                                                 <input autocomplete="off" type="text" class="form-control"  ref="customIDCard"  id="customIDCard" />
                                             </div>
                                             <div class="form-group">
-                                                <label class="control-label">寄送方式:&nbsp;&nbsp;</label>
-                                                <span class="control-label">快递柜打包:&nbsp;&nbsp;<input autocomplete="off" type="radio" @click="sendDiva" ref="status" name="status" value="1" checked="checked"/></span>&nbsp;&nbsp;
-                                                <span class="control-label">寄送到家:&nbsp;&nbsp;<input autocomplete="off" type="radio" @click="sendDivb" ref="status" name="status" value="0" /></span>
+                                                <label class="control-label">寄送方式:&nbsp;&nbsp;</label>&nbsp;&nbsp;&nbsp;
+                                                <span class="control-label"><input autocomplete="off" type="radio" @click="sendDiva" ref="status" name="status" value="1" checked="checked"/>&nbsp;:&nbsp;&nbsp;快递柜打包</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                                <span class="control-label"><input autocomplete="off" type="radio" @click="sendDivb" ref="status" name="status" value="0" />&nbsp;:&nbsp;&nbsp;寄送到家</span>
                                             </div>
                                             <div class="form-group sendShow" style="border-bottom: 1px solid #e5e5e5;">
                                                 <h4 class="modal-title">收件人信息</h4>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -968,6 +968,31 @@ let vm = new Vue({
             this.userInfo.customName = this.$refs.customName.value ;
             this.userInfo.customIDCard =  this.$refs.customIDCard.value ;
             this.userInfo.customPhone = this.$refs.customPhone.value;
+            var status = $('input:radio:checked').val();
+            var cmbCity = $('#cmbCity').val();
+            var cmbProvince = $('#cmbProvince').val();
+            var cmbArea = $('#cmbArea').val();
+            var addrUser = $('#addrUser').val();
+            // console.log('城市三级联动的值：'+cmbProvince+'|'+cmbCity+'|'+cmbArea+'|'+addrUser);
+
+            if (status == 0) {
+                if (cmbCity =="请选择"){
+                    alert("请选择省!");
+                    return ;
+                }
+                if (cmbProvince =="请选择"){
+                    alert("请选择市!");
+                    return ;
+                }
+                if (cmbArea =="请选择"){
+                    alert("请选择区!");
+                    return ;
+                }
+                if (addrUser == "") {
+                    alert("请填写详细地址!");
+                    return ;
+                }
+            }
             if(this.$refs.couponSn)
                 this.userInfo.couponSn = this.$refs.couponSn.value;
             var idcardReg = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
@@ -1278,9 +1303,9 @@ function openWebSocket() {
         //kmall测试环境
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
-        webSocket = new WebSocket("ws://8.135.102.238:8080//ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
         //kmall本地环境
-        // webSocket = new WebSocket("ws://127.0.0.1:9090//ws/server/"+163);
+        webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');

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

@@ -1,4 +1,4 @@
-var flag = true;
+
 $(function () {
     $("#jqGrid").jqGrid({
         url: '../mallpaymentorderdata/list',
@@ -57,6 +57,7 @@ $(function () {
 
 let vm = new Vue({
 	el: '#rrapp',
+
 	data: {
         showList: true,
         title: null,
@@ -73,7 +74,8 @@ let vm = new Vue({
 			payFlag: '',
 			startTime:'',
 			endTime:'',
-		}
+		},
+		flag : true,
 	},
 	methods: {
 		query: function () {
@@ -282,8 +284,8 @@ let vm = new Vue({
 			});
 		},
 		exportDataFormat : function () {
-			if (flag){
-				flag = false;
+			if (vm.flag){
+				vm.flag = false;
 				var params = {};
 				params.payFlag=vm.q.payFlag;
 				params.startTime=vm.q.startTime;
@@ -308,15 +310,22 @@ let vm = new Vue({
 					alert("导出时间不能相差大于30天");
 					return ;
 				}
-				// const msg = this.$Message.loading({
-				// 	content: 'Loading...',
-				// 	duration: 0
-				// });
-				// setTimeout(msg, 1000);
-				dialogLoading(true);
-				exportFile('#rrapp', '../mallpaymentorderdata/exportDataFormat', params);
-				setTimeout(dialogLoading(false),5000);
-				setTimeout(flag = true,5000);
+				const msg = this.$Message.loading({
+					content: 'Loading...',
+					duration: 0
+				});
+				confirm('确认导出账单吗？', function () {
+					setTimeout(msg, 1000);
+					exportFile('#rrapp', '../mallpaymentorderdata/exportDataFormat', params);
+					alert('操作成功,正在导出,请勿重复点击!', function (index) {
+						$("#jqGrid").trigger("reloadGrid");
+					});
+				});
+				vm.flag = true
+			}else {
+				alert("点击的太快了,请慢一点!");
+				vm.flag = true
+				return ;
 			}
 		},
 	},

kmall-admin/src/main/webapp/statics/dist/js7_jsAddress.js

@@ -62,6 +62,9 @@ var addressInit = function(_cmbProvince, _cmbCity, _cmbArea, defaultProvince, de
 	cmbProvince.onchange = changeProvince;
 }
 var provinceList = [
+{name:'请选择', cityList:[
+		{name:'请选择', areaList:['请选择']}
+	]},
 {name:'北京', cityList:[		   
 {name:'市辖区', areaList:['东城区','西城区','崇文区','宣武区','朝阳区','丰台区','石景山区','海淀区','门头沟区','房山区','通州区','顺义区','昌平区','大兴区','怀柔区','平谷区']},		   
 {name:'县', areaList:['密云县','延庆县']}

kmall-manager/src/main/java/com/kmall/manager/manager/redis/JedisProperties.java

@@ -14,15 +14,15 @@ public class JedisProperties implements Serializable {
     private String host;
     private String port;
     private Pool pool;
-//    private String password;
-
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
     public String getKeyPrefix() {
         return keyPrefix;

kmall-manager/src/main/resources/spring/spring-redis.xml

@@ -21,7 +21,7 @@
         <property name="keyPrefix" value="${redis.prod.keyPrefix}"/>
         <property name="host" value="${redis.prod.host}"/>
         <property name="port" value="${redis.prod.port}"/>
-<!--        <property name="password" value="${redis.prod.password}"/>-->
+        <property name="password" value="${redis.prod.password}"/>
         <property name="pool">
             <bean class="com.kmall.manager.manager.redis.JedisProperties$Pool">
                 <property name="maxIdle" value="${redis.prod.pool.maxIdle}"/>