Merge branch 'master' of lhm/kmall-haikong into master

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

@@ -17,6 +17,7 @@ import com.kmall.common.fileserver.util.FileManager;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.excel.ExcelExport;
 import com.kmall.common.utils.excel.ExcelUtil;
+import com.kmall.manager.manager.express.sf.ServiceException;
 import com.kmall.manager.manager.redis.JedisUtil;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
@@ -34,6 +35,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.sql.rowset.serial.SerialException;
 import java.io.*;
 import java.util.*;
 
@@ -589,6 +591,9 @@ public class GoodsController {
         Map<String,Object> map = null;
         try {
             map = goodsService.calculateGoodsDetail(prodBarcode,storeId,sku);
+        } catch (ServiceException e) {
+            log.error("查询订单详情出现异常！", e);
+            return R.error(e.getMessage());
         } catch (Exception e) {
             log.error("查询条码：【{}】详情出现异常！", prodBarcode, e);
             return R.error("系统异常，请联系管理员！e:"+e.getMessage());
@@ -612,6 +617,9 @@ public class GoodsController {
         Map<String,Object> map = null;
         try {
             map = goodsService.calculateGoodsDetail(prodBarcode,storeId,null);
+        } catch (ServiceException e) {
+            log.error("查询订单详情出现异常！", e);
+            return R.error(e.getMessage());
         } catch (Exception e) {
             log.error("查询条码：【{}】价格出现异常！", prodBarcode, e);
             return R.error("系统异常，请联系管理员！e:"+e.getMessage());
@@ -718,6 +726,9 @@ public class GoodsController {
         List<Map<String,Object>> mapList = null;
         try {
             mapList = goodsService.selectSkuDetails(prodBarcode,storeId);
+        } catch (ServiceException e) {
+            log.error("查询sku详情出现异常！", e);
+            return R.error(e.getMessage());
         } catch (Exception e) {
             return R.error("系统异常，请联系管理员！e:"+e.getMessage());
         }

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

@@ -22,6 +22,7 @@ import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatReverseApiResult;
 import com.kmall.manager.manager.alipay.AliPayMicropayApiResult;
 import com.kmall.manager.manager.alipay.AliPayUtil;
+import com.kmall.manager.manager.express.sf.ServiceException;
 import com.kmall.manager.manager.merch.OmsMerchPropertiesBuilder;
 import com.kmall.manager.manager.pingan.PinganUtil;
 import com.kmall.manager.manager.pingan.dto.PinganResponseDto;
@@ -1064,6 +1065,8 @@ public class OrderController {
                 return R.error((String) resultObj.get("errmsg"));
             }
             return R.ok().put("resultObj", resultObj);
+        } catch (ServiceException e) {
+            return R.error(e.getMessage());
         } catch (Exception e) {
             if (e.getMessage().contains("java.lang.IllegalStateException: invalid auth_code!")){
                 return R.error("付款码异常，请重新输入!");
@@ -1370,6 +1373,8 @@ public class OrderController {
         try {
             CalculateOrderDiscountPriceResponseVO calculateOrderDiscountPriceResponseVO = orderService.calculateOrderDiscountPrice(calculateOrderDiscountPriceVo);
             return R.ok().put("data", calculateOrderDiscountPriceResponseVO);
+        } catch (ServiceException e) {
+            return R.error(e.getMessage());
         } catch (Exception e) {
             return R.error("计算出错！请联系管理员！" + e.getMessage());
         }

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

@@ -888,8 +888,11 @@ let vm = new Vue({
             confirm('确认清空吗？', function () {
                 $.get("../goods/number/clear/" + sessionStorage.getItem("storeId"), function (res) {
                     if (res.code === 0) {
-                        alert("清空成功");
-                        vm.goodsList.clear();
+                        layer.confirm("清空成功", {
+                                skin: 'layui-layer-molv', btn: ['确定'], title: "提示"
+                            }, function () {
+                                location.reload();
+                            });
                     } else if (res.code === 500) {
                         alert(res.msg);
                     } else {
@@ -1937,7 +1940,7 @@ function handle(goodsDetails,operatorType){
     vm.showReduceMoney =  Math.round(vm.showReduceMoney * 100) / 100;
 
 
-    console.log("goodsDetails after=====>" + JSON.stringify(vm.goodsList));
+    // console.log("goodsDetails after=====>" + JSON.stringify(vm.goodsList));
 }
 
 // 下单处理