返修

src/main/java/com/izouma/awesomeadmin/dao/OrderRepairMapper.java

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.OrderRepair;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.OrderRepairMapper")
-public interface OrderRepairMapper{
+public interface OrderRepairMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -29,5 +30,7 @@ public interface OrderRepairMapper{
     OrderRepair queryOrderRepair(OrderRepair record);
 
     List<OrderRepair> query(OrderRepair record);
+
+    int repairByOrderId(OrderRepair orderRepair);
 }
 

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

@@ -438,6 +438,14 @@
             AND id = #{id}
         </where>
     </update>
+    <update id="repairByOrderId">
+        UPDATE order_repair
+            SET status_flag = 1
+        WHERE
+            del_flag = 'N'
+            AND status_flag = 0
+            AND order_id = #{orderId}
+    </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepair">
         select
         <include refid="Base_Column_List"/>

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

@@ -85,5 +85,7 @@ public interface UserOrderService {
      * @return
      */
     Result autoCancel();
+
+    boolean repair(UserOrder record);
 }
 

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

@@ -1,16 +1,15 @@
 package com.izouma.awesomeadmin.service.impl;
 
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.util.*;
-
+import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dao.*;
+import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.dto.WxPayRefundData;
 import com.izouma.awesomeadmin.model.*;
-import com.izouma.awesomeadmin.service.*;
+import com.izouma.awesomeadmin.service.MemberCoinService;
+import com.izouma.awesomeadmin.service.MemberPointService;
+import com.izouma.awesomeadmin.service.UserInfoService;
+import com.izouma.awesomeadmin.service.UserOrderService;
 import com.izouma.awesomeadmin.util.AlipayClientFactory;
 import com.izouma.awesomeadmin.util.MbappUtil;
 import com.izouma.awesomeadmin.util.PropertiesFileLoader;
@@ -22,13 +21,19 @@ import org.jdom.input.SAXBuilder;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.izouma.awesomeadmin.constant.AppConstant;
-import com.izouma.awesomeadmin.dto.Page;
 import org.xml.sax.InputSource;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * service接口实现类
@@ -65,6 +70,9 @@ public class UserOrderServiceImpl implements UserOrderService {
     @Autowired
     private SystemConfigMapper systemConfigMapper;
 
+    @Autowired
+    private OrderRepairMapper orderRepairMapper;
+
 
     @Override
     public List<UserOrder> getUserOrderList(UserOrder record) {
@@ -887,5 +895,34 @@ public class UserOrderServiceImpl implements UserOrderService {
         }
         return new Result(false, "取消无用订单失败");
     }
+
+    /**
+     * 返修
+     *
+     * @param record
+     * @return
+     */
+    @Override
+    public boolean repair(UserOrder record) {
+
+        logger.info("repair");
+        try {
+            int updates = userOrderMapper.updateByPrimaryKeySelective(record);
+
+            OrderRepair orderRepair = new OrderRepair();
+            orderRepair.setOrderId(record.getId() + "");
+            orderRepairMapper.repairByOrderId(orderRepair);
+
+
+            if (updates > 0) {
+                return true;
+            }
+
+        } catch (Exception e) {
+            logger.error("repair", e);
+        }
+
+        return false;
+    }
 }
 

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

@@ -1,21 +1,24 @@
 package com.izouma.awesomeadmin.web;
 
-import java.util.*;
-
-import com.izouma.awesomeadmin.util.ExportExcelUtil;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresAuthentication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.UserOrder;
 import com.izouma.awesomeadmin.service.UserOrderService;
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * controller类
@@ -252,6 +255,18 @@ public class UserOrderController {
     }
 
 
+    /**
+     * <p>返修。</p>
+     */
+    @RequestMapping(value = "/repair", method = RequestMethod.POST)
+    @ResponseBody
+    public Result repair(UserOrder record) {
+        boolean num = userOrderService.repair(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
 
 }