订单状态

src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.xml

@@ -1147,9 +1147,6 @@
             and del_flag = 'N'
             and status_flag = 0
             and order_id = #{orderId}
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
             <if test="storeId != null and !&quot;&quot;.equals(storeId)">
                 and store_id = #{storeId}
             </if>

src/main/java/com/izouma/awesomeadmin/service/UserOrderDetailService.java

@@ -1,12 +1,11 @@
 package com.izouma.awesomeadmin.service;
 
-import java.util.*;
-
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
-import com.izouma.awesomeadmin.model.UserOrder;
 import com.izouma.awesomeadmin.model.UserOrderDetail;
 
+import java.util.List;
+
 
 /**
  * service接口类
@@ -33,5 +32,16 @@ public interface UserOrderDetailService {
     Result checkRepairImageAndAlbum(String orderId, String repairId, String albumRepairId);
 
     Result updateImageAndAlbumRepair(UserOrderDetail record);
+
+    boolean repair(UserOrderDetail record);
+
+    /**
+     * <p>确认收货。</p>
+     *
+     * @param
+     * @return
+     */
+    Result confirm(UserOrderDetail record);
+
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderDetailServiceImpl.java

@@ -15,6 +15,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -98,7 +99,7 @@ public class UserOrderDetailServiceImpl implements UserOrderDetailService {
         try {
             int updates = userOrderDetailMapper.insertSelective(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createUserOrderDetail", e);
@@ -112,10 +113,10 @@ public class UserOrderDetailServiceImpl implements UserOrderDetailService {
         try {
             int updates = userOrderDetailMapper.delete(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteUserOrderDetail", e);
+            logger.error("deleteUserOrderDetail", e);
         }
         return false;
     }
@@ -126,10 +127,10 @@ public class UserOrderDetailServiceImpl implements UserOrderDetailService {
         try {
             int updates = userOrderDetailMapper.updateByPrimaryKeySelective(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateUserOrderDetail", e);
+            logger.error("updateUserOrderDetail", e);
         }
         return false;
     }
@@ -260,5 +261,88 @@ public class UserOrderDetailServiceImpl implements UserOrderDetailService {
         }
         return new Result(false, "updateImageAndAlbumRepair失败");
     }
+
+    @Override
+    public Result confirm(UserOrderDetail record) {
+
+        logger.info("confirm：确认完成订单");
+        try {
+            UserOrderDetail userOrder = userOrderDetailMapper.selectByPrimaryKey(record.getId());
+            if (userOrder != null) {
+
+                boolean confirmFlag = false;
+
+
+                if (AppConstant.OrderAlbumStatus.WAIT_ACCEPT == userOrder.getAlbumStatus() ||
+                        AppConstant.OrderAlbumStatus.REWORK_ACCEPT == userOrder.getAlbumStatus()) {//修图完成
+
+                    confirmFlag = true;
+                    record.setAlbumStatus(AppConstant.OrderAlbumStatus.FINISH);
+
+
+                }
+
+
+                if (confirmFlag) {
+
+                    userOrderDetailMapper.updateByPrimaryKeySelective(record);
+
+                }
+            }
+
+            return new Result(true, "confirm：确认完成成功");
+
+        } catch (Exception e) {
+            logger.error("confirm：确认完成异常", e);
+        }
+        return new Result(false, "confirm：确认完成失败");
+    }
+
+    /**
+     * 返修
+     *
+     * @param record
+     * @return
+     */
+    @Override
+    public boolean repair(UserOrderDetail record) {
+
+        logger.info("repair");
+        try {
+
+            if (record.getId() != null && record.getId() > 0) {
+                if ("order_image".equals(record.getAcceptType()) || "image_album".equals(record.getAcceptType())) {
+
+                    record.setAlbumStatus(AppConstant.OrderAlbumStatus.REWORK);
+                    OrderRepair orderRepair = new OrderRepair();
+                    orderRepair.setOrderId(record.getId() + "");
+                    orderRepairMapper.repairByOrderId(orderRepair);
+
+                }
+
+                if ("order_album".equals(record.getAcceptType()) || "image_album".equals(record.getAcceptType())) {
+
+                    record.setAlbumStatus(AppConstant.OrderAlbumStatus.REWORK);
+                    OrderAlbumRepair orderAlbumRepair = new OrderAlbumRepair();
+                    orderAlbumRepair.setOrderId(record.getId() + "");
+                    orderAlbumRepairMapper.repairByOrderId(orderAlbumRepair);
+                }
+
+                int updates = userOrderDetailMapper.updateByPrimaryKeySelective(record);
+
+
+                if (updates > 0) {
+                    return true;
+                }
+            }
+
+
+        } catch (Exception e) {
+            logger.error("repair", e);
+        }
+
+        return false;
+    }
+
 }
 

src/main/java/com/izouma/awesomeadmin/web/UserOrderDetailController.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserOrder;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -216,5 +217,32 @@ public class UserOrderDetailController {
 
     }
 
+    /**
+     * 确认完成订单
+     *
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = "/confirm", method = RequestMethod.POST)
+    @ResponseBody
+    public Result confirm(UserOrderDetail record) {
+
+        return userOrderDetailService.confirm(record);
+
+    }
+
+    /**
+     * <p>返修。</p>
+     */
+    @RequestMapping(value = "/repair", method = RequestMethod.POST)
+    @ResponseBody
+    public Result repair(UserOrderDetail record) {
+        boolean num = userOrderDetailService.repair(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
 }