Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

order-application-service/src/main/java/cn/freemud/controller/McCafeController.java

@@ -133,6 +133,17 @@ public class McCafeController {
 
 
 
+    /**
+     * 麦咖啡推送订单数据到麦当劳 -- 补偿/修正
+     */
+    @ApiAnnotation(logMessage = "mcCafePushOrderMakeUp")
+    @PostMapping("/mcCafePushOrderMakeUp")
+    public BaseResponse mcCafePushOrderMakeUp(@Validated @LogParams @RequestBody McCafeQueryOrderVo queryOrderVo) {
+        return mcCafeOrderService.mcCafePushOrderMakeUp(queryOrderVo);
+    }
+
+
+
 }
 
 

order-application-service/src/main/java/cn/freemud/manager/PushMccafeOrderManager.java

@@ -7,6 +7,8 @@ import cn.freemud.manager.dao.PushMccafeOrderDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 商户小程序manager
  *
@@ -23,6 +25,10 @@ public class PushMccafeOrderManager {
         return pushMccafeOrderDao.selectOrder(orderCode);
     }
 
+    public List<PushMccafeOrder> selectOrderByStatus(Integer id) {
+        return pushMccafeOrderDao.selectOrderByStatus(id);
+    }
+
     public Integer insertOrder(PushMccafeOrder pushMccafeOrder) {
         return pushMccafeOrderDao.insertOrder(pushMccafeOrder);
     }

order-application-service/src/main/java/cn/freemud/manager/dao/PushMccafeOrderDao.java

@@ -5,11 +5,15 @@ import cn.freemud.entities.db.PushMccafeOrder;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PushMccafeOrderDao {
 
     PushMccafeOrder selectOrder(@Param("orderCode") String orderCode);
 
+    List<PushMccafeOrder> selectOrderByStatus(@Param("status") Integer status);
+
     Integer insertOrder(PushMccafeOrder pushMccafeOrder);
 
     Integer updateOrder(PushMccafeOrder pushMccafeOrder);

order-application-service/src/main/java/cn/freemud/service/MCCafeOrderService.java

@@ -58,4 +58,6 @@ public interface MCCafeOrderService {
 
     BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo);
 
+    BaseResponse mcCafePushOrderMakeUp(McCafeQueryOrderVo queryOrderVo);
+
 }

order-application-service/src/main/resources/mapper/PushMccafeOrderDao.xml

@@ -19,6 +19,14 @@
         FROM push_mccafe_order WHERE order_code=#{orderCode}
     </select>
 
+    <select id="selectOrder" resultType="cn.freemud.entities.db.PushMccafeOrder">
+        SELECT
+        <include refid="all_column"/>
+        FROM push_mccafe_order WHERE status = 0
+        id > #{id}
+        limit 500;
+    </select>
+
     <insert id="insertOrder" parameterType="cn.freemud.entities.db.PushMccafeOrder">
         INSERT INTO push_mccafe_order ( order_code, partner_id,store_id,status,fail_reason)
                        VALUES