返修

src/main/java/com/izouma/awesomeadmin/model/OrderImage.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class OrderImage{
+public class OrderImage {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -26,154 +27,189 @@ public class OrderImage{
     private Integer statusFlag;
     private String remark;
 
-private String searchKey;
+    private String repairRemark;
+
+    private String detailRemark;
+
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    private String searchKey;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-    public Integer getId(){
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getOrderId(){
+
+    public String getOrderId() {
         return this.orderId;
     }
 
-    public void setOrderId(String orderId){
+    public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-    public String getUserId(){
+
+    public String getUserId() {
         return this.userId;
     }
 
-    public void setUserId(String userId){
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-    public String getStoreId(){
+
+    public String getStoreId() {
         return this.storeId;
     }
 
-    public void setStoreId(String storeId){
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-    public String getOriginalImage(){
+
+    public String getOriginalImage() {
         return this.originalImage;
     }
 
-    public void setOriginalImage(String originalImage){
+    public void setOriginalImage(String originalImage) {
         this.originalImage = originalImage;
     }
-    public BigDecimal getOriginalSize(){
+
+    public BigDecimal getOriginalSize() {
         return this.originalSize;
     }
 
-    public void setOriginalSize(BigDecimal originalSize){
+    public void setOriginalSize(BigDecimal originalSize) {
         this.originalSize = originalSize;
     }
-    public String getFinishedImage(){
+
+    public String getFinishedImage() {
         return this.finishedImage;
     }
 
-    public void setFinishedImage(String finishedImage){
+    public void setFinishedImage(String finishedImage) {
         this.finishedImage = finishedImage;
     }
-    public BigDecimal getFinishedSize(){
+
+    public BigDecimal getFinishedSize() {
         return this.finishedSize;
     }
 
-    public void setFinishedSize(BigDecimal finishedSize){
+    public void setFinishedSize(BigDecimal finishedSize) {
         this.finishedSize = finishedSize;
     }
-    public String getDealUser(){
+
+    public String getDealUser() {
         return this.dealUser;
     }
 
-    public void setDealUser(String dealUser){
+    public void setDealUser(String dealUser) {
         this.dealUser = dealUser;
     }
-    public Integer getStatusFlag(){
+
+    public Integer getStatusFlag() {
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag){
+    public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
+    public String getRepairRemark() {
+        return repairRemark;
+    }
+
+    public void setRepairRemark(String repairRemark) {
+        this.repairRemark = repairRemark;
+    }
+
+    public String getDetailRemark() {
+        return detailRemark;
+    }
+
+    public void setDetailRemark(String detailRemark) {
+        this.detailRemark = detailRemark;
+    }
 }
 

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

@@ -23,5 +23,12 @@ public interface OrderImageService{
     boolean deleteOrderImage(String id);
 
     boolean updateOrderImage(OrderImage record);
+
+    /**
+     * 返修
+     * @param record
+     * @return
+     */
+    boolean repair(OrderImage record);
 }
 

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

@@ -1,6 +1,11 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
+import com.izouma.awesomeadmin.dao.OrderRepairDetailMapper;
+import com.izouma.awesomeadmin.dao.OrderRepairMapper;
+import com.izouma.awesomeadmin.model.OrderRepair;
+import com.izouma.awesomeadmin.model.OrderRepairDetail;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,42 +16,50 @@ import com.izouma.awesomeadmin.service.OrderImageService;
 import com.izouma.awesomeadmin.dao.OrderImageMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class OrderImageServiceImpl implements OrderImageService{
+public class OrderImageServiceImpl implements OrderImageService {
 
     private static Logger logger = Logger.getLogger(OrderImageServiceImpl.class);
 
     @Autowired
     private OrderImageMapper orderImageMapper;
 
+    @Autowired
+    private OrderRepairMapper orderRepairMapper;
+
+    @Autowired
+    private OrderRepairDetailMapper orderRepairDetailMapper;
+
+
     @Override
     public List<OrderImage> getOrderImageList(OrderImage record) {
 
         logger.info("getOrderImageList");
         try {
 
-        return orderImageMapper.queryAllOrderImage(record);
+            return orderImageMapper.queryAllOrderImage(record);
         } catch (Exception e) {
-        logger.error("getOrderImageList", e);
+            logger.error("getOrderImageList", e);
         }
 
         return null;
     }
+
     @Override
     public List<OrderImage> getOrderImageByPage(Page page, OrderImage record) {
 
         logger.info("getOrderImageByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return orderImageMapper.queryOrderImageByPage(parameter);
+            return orderImageMapper.queryOrderImageByPage(parameter);
         } catch (Exception e) {
-        logger.error("getOrderImageByPage", e);
+            logger.error("getOrderImageByPage", e);
         }
 
         return null;
@@ -60,7 +73,7 @@ public class OrderImageServiceImpl implements OrderImageService{
 
             return orderImageMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getOrderImageById", e);
+            logger.error("getOrderImageById", e);
         }
 
         return null;
@@ -74,7 +87,7 @@ public class OrderImageServiceImpl implements OrderImageService{
 
             return orderImageMapper.queryOrderImage(record);
         } catch (Exception e) {
-        logger.error("getOrderImage", e);
+            logger.error("getOrderImage", e);
         }
 
         return null;
@@ -89,7 +102,7 @@ public class OrderImageServiceImpl implements OrderImageService{
             int updates = orderImageMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createOrderImage", e);
@@ -104,13 +117,13 @@ public class OrderImageServiceImpl implements OrderImageService{
         logger.info("deleteOrderImage");
         try {
 
-             int updates = orderImageMapper.delete(id);
+            int updates = orderImageMapper.delete(id);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteOrderImage", e);
+            logger.error("deleteOrderImage", e);
         }
 
         return false;
@@ -125,10 +138,85 @@ public class OrderImageServiceImpl implements OrderImageService{
             int updates = orderImageMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
+            }
+
+
+        } catch (Exception e) {
+            logger.error("updateOrderImage", e);
+        }
+
+        return false;
+    }
+
+
+    /**
+     * 返修
+     *
+     * @param record
+     * @return
+     */
+    @Override
+    public boolean repair(OrderImage record) {
+
+        logger.info("repair");
+        try {
+            int updates = orderImageMapper.updateByPrimaryKeySelective(record);
+
+            OrderRepair orderRepair = new OrderRepair();
+            orderRepair.setOrderId(record.getOrderId());
+            List<OrderRepair> orderRepairList = orderRepairMapper.queryAllOrderRepair(orderRepair);
+
+            //当前返修订单。
+            OrderRepair nowOrderRepair = new OrderRepair();
+
+            if (orderRepairList.size() > 0) {
+                OrderRepair lastRepair = orderRepairList.get(orderRepairList.size() - 1);
+
+                //如果状态为已完成
+                if (lastRepair.getStatusFlag() == 1 && lastRepair.getTypeFlag() < 2) {
+                    nowOrderRepair.setOrderId(record.getOrderId());
+                    nowOrderRepair.setUserId(record.getUserId());
+                    nowOrderRepair.setStoreId(record.getStoreId());
+                    nowOrderRepair.setTypeFlag(lastRepair.getTypeFlag() + 1);
+
+                    orderRepairMapper.insertSelective(nowOrderRepair);
+
+                } else if (lastRepair.getStatusFlag() == 0) {
+                    nowOrderRepair = lastRepair;
+                }
+
+
+            } else {
+                nowOrderRepair.setOrderId(record.getOrderId());
+                nowOrderRepair.setUserId(record.getUserId());
+                nowOrderRepair.setStoreId(record.getStoreId());
+
+                orderRepairMapper.insertSelective(nowOrderRepair);
+            }
+
+
+            OrderRepairDetail orderRepairDetail = new OrderRepairDetail();
+            orderRepairDetail.setRepairId(nowOrderRepair.getId() + "");
+            orderRepairDetail.setImageId(record.getId() + "");
+
+            orderRepairDetail = orderRepairDetailMapper.queryOrderRepairDetail(orderRepairDetail);
+            if (orderRepairDetail != null) {
+                orderRepairDetail.setRemark(record.getDetailRemark());
+                orderRepairDetailMapper.updateByPrimaryKeySelective(orderRepairDetail);
+            } else {
+                orderRepairDetail.setRemark(record.getDetailRemark());
+
+                orderRepairDetailMapper.insertSelective(orderRepairDetail);
+            }
+
+
+            if (updates > 0) {
+                return true;
             }
+
         } catch (Exception e) {
-             logger.error("updateOrderImage", e);
+            logger.error("repair", e);
         }
 
         return false;

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

@@ -163,5 +163,19 @@ public class OrderImageController {
 
 
         }
+
+
+    /**
+     * <p>返修。</p>
+     */
+    @RequestMapping(value = "/repair", method = RequestMethod.POST)
+    @ResponseBody
+    public Result repair(OrderImage record) {
+        boolean num = orderImageService.repair(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
     }