bug fixes

src/main/java/com/caimei/controller/order/OrderController.java

@@ -64,8 +64,14 @@ public class OrderController {
     @ResponseBody
     @RequestMapping("/share")
     public WxJsonModel shareOrder(Integer orderID) {
-        String shareCode = orderService.shareOrder(orderID);
-        return WxJsonModel.newInstance().success(shareCode);
+        WxJsonModel model = WxJsonModel.newInstance();
+        String shareCode = null;
+        try {
+            shareCode = orderService.shareOrder(orderID);
+        } catch (Exception e) {
+            return model.error("" + e.getMessage());
+        }
+        return model.success(shareCode);
     }
 
     /**

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -67,7 +67,7 @@ public interface OrderMapper {
     void updateLogisticsBatch(Integer orderID);
 
     //获取订单发票信息
-    OrderInvoice getOrderInvoice(@Param("userID") Integer userID);
+    OrderInvoice getOrderInvoice(@Param("orderId") Integer orderId);
 
     //保存订单发票信息
     void insertOrderInvoice(OrderInvoice orderInvoice);

src/main/java/com/caimei/service/order/OrderService.java

@@ -9,7 +9,7 @@ import java.util.Map;
 public interface OrderService {
     Map<String, Object> confirmOrder(Integer userId, String classifyIDS, Integer organizeID, String productIDs, Integer count);
 
-    String shareOrder(Integer orderID);
+    String shareOrder(Integer orderID) throws Exception;
 
     Map<String, Object> particulars(Integer orderID);
 

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -132,7 +132,9 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public String shareOrder(Integer orderID) {
+    public String shareOrder(Integer orderID) throws Exception {
+        CmOrder order = orderMapper.findOrder(orderID);
+        if (order == null) throw new Exception("订单不存在");
         OrderShareCode orderShareCode = orderMapper.queryCode(orderID);
         //生成分享码
         String shareCode = RandomStringUtils.random(4, false, true);
@@ -214,19 +216,19 @@ public class OrderServiceImpl implements OrderService {
             shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
         }
         //发票信息
-        UserInvoiceInfo invoice = personalMapper.findInvoice(order.getUserID());
+        OrderInvoice orderInvoice = orderMapper.getOrderInvoice(orderID);
         //支付记录
         List<CmDiscernReceipt> discernReceiptList = orderMapper.findDiscernReceipt(orderID);
         //退款记录
         List<CmReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID());
         //客服热线号码
-        String cellPhone = loginMapper.cellPhone(orderID);
+        String cellPhone = loginMapper.cellPhone(order.getOrganizeID());
         //分享码
         String shareCode = orderMapper.findShareCode(orderID);
         map.put("order", order);
         map.put("userInfo", userInfo);
         map.put("shopOrderList", shopOrderList);
-        map.put("invoice", invoice);
+        map.put("orderInvoice", orderInvoice);
         map.put("discernReceiptList", discernReceiptList);
         map.put("returnedPurchaseList", returnedPurchaseList);
         map.put("cellPhone", cellPhone);
@@ -591,7 +593,7 @@ public class OrderServiceImpl implements OrderService {
 
             //获取地址信息
             Address address = addressMapper.findByAddressID(addressID);
-            if(null != address){
+            if (null != address) {
                 //保存地址信息
                 BpOrderUserInfo bpOrderUserInfo = new BpOrderUserInfo();
                 bpOrderUserInfo.setOrderId(orderID);
@@ -608,15 +610,15 @@ public class OrderServiceImpl implements OrderService {
                 bpOrderUserInfo.setTown(address.getTown());
                 bpOrderUserInfo.setAddress(address.getAddressDetail());
                 bpUserInfoMapper.insertUserInfo(bpOrderUserInfo);
-            }else{
+            } else {
                 return wxJsonModel.error("订单地址异常");
             }
 
 
             //保存发票信息(发票采用不可选，只要用户存在增值税发票则保存最新记录即可)
             UserInvoiceInfo invoiceInfo = personalMapper.findInvoice(userId);
-            if(null != invoiceInfo){
-                OrderInvoice orderInvoice  = new OrderInvoice();
+            if (null != invoiceInfo) {
+                OrderInvoice orderInvoice = new OrderInvoice();
                 orderInvoice.setOrderId(orderID);
                 orderInvoice.setInvoiceTitle(invoiceInfo.getInvoiceTitle());
                 orderInvoice.setType("2");//增值税发票