diff --git a/src/main/java/com/hxtec/polaris/controller/OrderController.java b/src/main/java/com/hxtec/polaris/controller/OrderController.java
index 37c3863c5d0ef1d7564bea72e85cf6ee48990b29..89a99543ecc114cf5796be2921929d4e98f018be 100644
--- a/src/main/java/com/hxtec/polaris/controller/OrderController.java
+++ b/src/main/java/com/hxtec/polaris/controller/OrderController.java
@@ -74,6 +74,11 @@ public class OrderController {
         return orderService.confirmReceipt(shopOrder);
     }
 
+    @PostMapping("rateOrder")
+    public Object rateOrder(int id,int state,String content){
+        return orderService.rateOrder(id,state,content);
+    }
+
     @PostMapping("submitOrder")
     public Result<?> submitOrder(@RequestBody ShopAddress shopAddress) {
         Map<String,Object> map=orderService.submitOrder(shopAddress);
diff --git a/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java b/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java
index 0d2adbd0bd4ad0b5b9fed9d5579bf4d5e5d530ee..0d915c56a1cc444a5e858f646fa7ad4a25876f3a 100644
--- a/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java
+++ b/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java
@@ -72,4 +72,13 @@ public interface ShopOrderMapper extends MyMapper<ShopOrder> {
      * @param date  更新时间
      */
     void doCancelOrder(@Param("oid") Integer id, @Param("uid")  String s,@Param("state")  int state,@Param("updatetime") Date date);
+
+    /**
+     * 执行订单评价 将state改为已完成 4
+     * @param id    订单id
+     * @param uid    用户id
+     * @param state  收货后的订单状态 4
+     * @param date  更新时间
+     */
+    void doRateOrder(@Param("oid") int id, @Param("uid")String uid, @Param("state")int state,@Param("updatetime") Date date);
 }
\ No newline at end of file
diff --git a/src/main/java/com/hxtec/polaris/service/OrderService.java b/src/main/java/com/hxtec/polaris/service/OrderService.java
index 88b09d97731c1a23e5ff2d35c81008c804f43e6a..f83ca6615fc3438f01ec7adff4becbf3ca8f9245 100644
--- a/src/main/java/com/hxtec/polaris/service/OrderService.java
+++ b/src/main/java/com/hxtec/polaris/service/OrderService.java
@@ -65,4 +65,13 @@ public interface OrderService {
      * @return
      */
     Object cancelOrder(ShopOrder shopOrder);
+
+    /**
+     * 评价订单
+     * @param id
+     * @param state
+     * @param content
+     * @return
+     */
+    Object rateOrder(int id,int state, String content);
 }
diff --git a/src/main/java/com/hxtec/polaris/service/impl/OrderServiceImpl.java b/src/main/java/com/hxtec/polaris/service/impl/OrderServiceImpl.java
index f361f07801eb1a3158970d48333a95af4aa0f688..9b70289ebe68a471fd8a5a2e2fcd4e8ac5051817 100644
--- a/src/main/java/com/hxtec/polaris/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/hxtec/polaris/service/impl/OrderServiceImpl.java
@@ -54,6 +54,7 @@ public class OrderServiceImpl implements OrderService{
     private final static String LOG_METHOD_CONFIRM_RECEIVE = "confirmReceipt";
     private final static String LOG_METHOD_DELETE_ORDER = "deleteOrder";
     private final static String LOG_METHOD_CANCEL_ORDER = "cancelOrder";
+    private final static String LOG_METHOD_RATE_ORDER = "rateOrder";
 
     @Resource
     private ShopOrderItemMapper shopOrderItemMapper;
@@ -237,6 +238,32 @@ public class OrderServiceImpl implements OrderService{
         }
     }
 
+    @Override
+    public Object rateOrder(int id,int state, String content) {
+        try{
+            doRateOrder(id,state,content);
+            return Result.ok();
+        }catch (Exception e){
+            String params = "orderid="+id+";content="+content;
+            String LOG_MSG = MessageFormat.format(Log.PATTERN_LOG,Log.UPDATE,LOG_CLASS_NAME,LOG_METHOD_RATE_ORDER,params);
+            throw new MyException(Result.error(Code.FAIL_4601, Msg.COMMON_FAIL),LOG_MSG);
+        }
+    }
+
+    /**
+     * 执行订单评价
+     * @param id    订单id
+     * @param state    订单state
+     * @param content   评价内容
+     */
+    private void doRateOrder(int id, int state,String content) {
+        //只有订单待评价的情况下才可以评价订单
+        if (state == GlobalVar.ORDER_REPLYING){
+            //执行更新
+            shopOrderMapper.doRateOrder(id,String.valueOf(userService.getUserInfo().getId()),GlobalVar.ORDER_SUCCESS,new Date());
+        }
+    }
+
     /**
      * 执行订单取消 state设置为5 已关闭状态
      * @param shopOrder
diff --git a/src/main/resources/mapper/ShopOrderMapper.xml b/src/main/resources/mapper/ShopOrderMapper.xml
index eb87535df5cf2084f482533ecfe29ad685a900b3..d70c738a289d501c5cbcb8ed16d0d7fdbe84a5a4 100644
--- a/src/main/resources/mapper/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/ShopOrderMapper.xml
@@ -55,6 +55,12 @@
     where id=#{oid} and member_id=#{uid} and state = 0 and (isnull(is_delete) or is_delete!='Y')
   </update>
 
+  <update id="doRateOrder">
+    UPDATE shop_order
+    set state = #{state},update_time=#{updatetime}
+    where id=#{oid} and member_id=#{uid} and state = 3 and (isnull(is_delete) or is_delete!='Y')
+  </update>
+
   <update id="doDeleteOrder">
     UPDATE shop_order
     set is_delete='Y',update_time=#{updatetime}