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

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

@@ -2217,7 +2217,7 @@ public class OrderServiceImpl implements OrderService {
                 }
             }
 
-//            // TODO 到时候要注释掉，测试用而已
+            // TODO 到时候要注释掉，测试用而已
 //            OrderEntity orderEntity = queryObject(order.getId());
 //            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
 //            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
@@ -2729,6 +2729,19 @@ public class OrderServiceImpl implements OrderService {
             return R.error("订单已退款");
         }
 
+        if (orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_0.getItem())) {
+            return R.error("订单正在准备，请稍等！");
+        }
+        if (orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_100.getItem())) {
+            return R.error("订单尚未支付完成，无法进行退款！");
+        }
+        if (orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_101.getItem())) {
+            return R.error("订单尚未支付完成，无法进行退款！");
+        }
+        if (orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_102.getItem())) {
+            return R.error("订单尚未支付完成，无法进行退款！");
+        }
+
         String payFlag = order.getPayFlag();
 
         String key  = "kmall_order_refund_" + order.getOrderSn();
@@ -2736,7 +2749,7 @@ public class OrderServiceImpl implements OrderService {
             return R.error("订单退款操作过快，请等待！");
         }
 
-        JedisUtil.set(key, System.currentTimeMillis() + "", 2);
+        JedisUtil.set(key, System.currentTimeMillis() + "", 3);
         if (orderInfo.getPayStatus() == Integer.parseInt(Dict.payStatus.item_3.getItem())) {
             return R.error("订单正在退款中，请勿重复退款");
         }
@@ -2812,6 +2825,16 @@ public class OrderServiceImpl implements OrderService {
             AliPayMicropayApiResult userRefund = AliPayUtil.aliTradeRefund(order.getOrderSn(), order.getActualPrice().toString(),
                     "用户退款", order.getStoreId() + "");
 
+            // 是否已退款校验
+            try {
+                String fundChange = userRefund.getFundChange();
+                if ("N".equals(fundChange)) {
+                    return R.error("资金已退回，请勿重复退款！");
+                }
+            } catch (Exception e) {
+
+            }
+
             LOGGER.info(userRefund.getSubMsg());
 
             OrderRefundEntity orderRefund = new OrderRefundEntity();

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

@@ -55,7 +55,7 @@ public class PickUpCodeServiceImpl implements PickUpCodeService {
         if(pickUpCodeSn == null){
             pickUpCodeSn = "0001";
         }else{
-            AtomicInteger integer = new AtomicInteger(Integer.valueOf(pickUpCodeSn.substring(pickUpCodeSn.indexOf("-")+1)));
+            AtomicInteger integer = new AtomicInteger(Integer.valueOf(pickUpCodeSn.substring(pickUpCodeSn.lastIndexOf("-")+1)));
             int i = integer.incrementAndGet();
             pickUpCodeSn= String.format("%04d", i);
         }

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

@@ -211,7 +211,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessUpImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -234,7 +234,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessDownImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -257,7 +257,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessLeftImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -280,7 +280,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessRightImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -303,7 +303,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessBeforeImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -326,7 +326,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="100"
+                                max-size="3000"
                                 :on-success="handleSuccessAfterImg" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">

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

@@ -247,25 +247,25 @@ let vm = new Vue({
                 {required: true, message: '第二法定单位数量不能为空', trigger: 'blur'}
             ],
             upImg: [
-                {required: true, message: '上方图片不能为空', trigger: 'blur'}
+                {required: false, message: '上方图片不能为空', trigger: 'blur'}
             ],
             downImg: [
-                {required: true, message: '下方图片不能为空', trigger: 'blur'}
+                {required: false, message: '下方图片不能为空', trigger: 'blur'}
             ],
             leftImg: [
-                {required: true, message: '左侧图片不能为空', trigger: 'blur'}
+                {required: false, message: '左侧图片不能为空', trigger: 'blur'}
             ],
             rightImg: [
-                {required: true, message: '右侧图片不能为空', trigger: 'blur'}
+                {required: false, message: '右侧图片不能为空', trigger: 'blur'}
             ],
             beforeImg: [
-                {required: true, message: '前方图片不能为空', trigger: 'blur'}
+                {required: false, message: '前方图片不能为空', trigger: 'blur'}
             ],
             afterImg: [
-                {required: true, message: '后方图片不能为空', trigger: 'blur'}
+                {required: false, message: '后方图片不能为空', trigger: 'blur'}
             ],
             name: [
-                {required: true, message: '名称不能为空', trigger: 'blur'}
+                {required: false, message: '名称不能为空', trigger: 'blur'}
             ]
         },
         q: {

kmall-manager/src/main/java/com/kmall/manager/manager/wechat/WechatUtil.java

@@ -23,6 +23,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -40,7 +42,7 @@ import java.util.*;
  * @date 2017年6月6日  下午5:05:03
  */
 public class WechatUtil {
-    private static Log logger = LogFactory.getLog(WechatUtil.class);
+    private static Logger logger = LoggerFactory.getLogger(WechatUtil.class);
 
     /**
      * 充值客户端类型--微信公众号