Merge remote-tracking branch 'origin/hph' into dev

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java

@@ -47,4 +47,7 @@ public interface TbOrderInfoMapper {
     Map<String,String> selectByOrderId(String orderId);
 
     List<SkuInfoPo> selectSkuByOrderId(String orderId);
+
+
+    TbOrderInfo selectById(Integer id);
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -1067,7 +1067,7 @@ public class OrderService {
 
 
     public Result getOrder(Integer orderId){
-      return Result.success(CodeEnum.SUCCESS, tbOrderInfoMapper.selectByPrimaryKey(orderId)) ;
+      return Result.success(CodeEnum.SUCCESS, tbOrderInfoMapper.selectById(orderId)) ;
     }
 
 

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -599,4 +599,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
                 AND d.product_sku_id = c.sku_id
         where c.order_id=#{orderId}
     </select>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        select * from tb_order_info where id=#{id} and status='closed'
+    </select>
 </mapper>